diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
index 051a088bfc..0911f48190 100644
--- a/Parser/Device/AbstractDeviceParser.php
+++ b/Parser/Device/AbstractDeviceParser.php
@@ -243,7 +243,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'BO'  => 'BangOlufsen',
         'BN'  => 'Barnes & Noble',
         'BAR' => 'BARTEC',
-        'BAS' => 'BASE',
         'BAU' => 'BAUHN',
         'BB'  => 'BBK',
         '0B'  => 'BB Mobile',
@@ -380,9 +379,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         '25'  => 'Claresta',
         'CLA' => 'CLAYTON',
         'CLT' => 'Clovertek',
-        '1J'  => 'Cloud',
+        '1J'  => 'Cloud Mobile',
         'CD'  => 'Cloudfone',
-        '6C'  => 'Cloudpad',
         'C0'  => 'Clout',
         'CN'  => 'CnM',
         'CY'  => 'Coby Kyros',
@@ -447,7 +445,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         '7D'  => 'Datamini',
         '6D'  => 'Datalogic',
         'D1'  => 'Datsun',
-        'DZ'  => 'Dazen',
         'DAS' => 'DASS',
         'DAW' => 'Dawlance',
         'DB'  => 'Dbtel',
@@ -477,25 +474,25 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DH'  => 'Digihome',
         'DD'  => 'Digiland',
         'DIJ' => 'DIJITSU',
-        'DIG' => 'Digit4G',
+        'DIG' => 'Digit',
         'DIC' => 'DIGICOM',
         'Q0'  => 'DIGIFORS',
         'DIK' => 'DIKOM',
         'DQ'  => 'DISH',
         'DIS' => 'Disney',
-        '9D'  => 'Ditecma',
         'D2'  => 'Digma',
         '1D'  => 'Diva',
         'DIV' => 'DiverMax',
         'D6'  => 'Divisat',
         'DIO' => 'DIORA',
         'DIF' => 'Diofox',
-        'X6'  => 'DIXON',
         'DIM' => 'DIMO',
-        '5D'  => 'DING DING',
         'DIN' => 'Dinax',
         'DNA' => 'Dinalink',
-        'DM'  => 'DMM',
+        '5D'  => 'DING DING',
+        '9D'  => 'Ditecma',
+        'X6'  => 'DIXON',
+        'DM'  => 'Dream Multimedia',
         'DMO' => 'DMOAO',
         'DN'  => 'DNS',
         'DC'  => 'DoCoMo',
@@ -516,7 +513,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'DJ'  => 'Dragon Touch',
         'DRA' => 'DRAGON',
         'DY'  => 'Dreamgate',
-        'DRE' => 'DreamTab',
         'DR1' => 'DreamStar',
         'DTA' => 'Dtac',
         'DU'  => 'Dune HD',
@@ -568,7 +564,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'UE'  => 'Ematic',
         'EMR' => 'Emporia',
         '4K'  => 'EKT',
-        'EKI' => 'EKINOX',
         '7E'  => 'ELARI',
         '03'  => 'Electroneum',
         'Z8'  => 'ELECTRONIA',
@@ -589,6 +584,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '3E'  => 'Enot',
         'ENT' => 'Entity',
         'ENV' => 'Envizen',
+        'Q1'  => 'EPIK Learning',
         '8E'  => 'Epik One',
         'EPK' => 'Epic',
         'XP'  => 'Epson',
@@ -597,7 +593,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'E7'  => 'Ergo',
         'EC'  => 'Ericsson',
         '05'  => 'Erisson',
-        'ER'  => 'Ericy',
         'EE'  => 'Essential',
         'E2'  => 'Essentielb',
         '6E'  => 'eSTAR',
@@ -622,6 +617,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '5U'  => 'EVPAD',
         'EVV' => 'evvoli',
         'E0'  => 'EvroMedia',
+        'EXR' => 'Exertis',
         'XE'  => 'ExMobile',
         '4Z'  => 'Exmart',
         'EH'  => 'EXO',
@@ -635,7 +631,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'EZ'  => 'Ezze',
         'UF'  => 'EYU',
         'EYE' => 'Eyemoo',
-        'UE1' => 'UE',
         '5F'  => 'F150',
         'FPS' => 'F+',
         'F6'  => 'Facebook',
@@ -739,8 +734,8 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GJ'  => 'Ghost',
         'GG'  => 'Gigabyte',
         'GS'  => 'Gigaset',
-        'GZ'  => 'Ginzzu',
         '1G'  => 'Gini',
+        'GZ'  => 'Ginzzu',
         'GI'  => 'Gionee',
         'GIR' => 'GIRASOLE',
         'G4'  => 'Globex',
@@ -821,7 +816,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'HIH' => 'HiHi',
         'HIK' => 'HiKing',
         'H2'  => 'Highscreen',
-        'Q1'  => 'High Q',
         'HI1' => 'HIGH1ONE',
         'HIG' => 'HiGrace',
         '1H'  => 'Hipstreet',
@@ -832,7 +826,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H8'  => 'Hitech',
         'W3'  => 'HiMax',
         '8X'  => 'Hi Nova',
-        'HLL' => 'HLLO',
         'HKC' => 'HKC',
         'HMD' => 'HMD',
         '8W'  => 'HKPro',
@@ -850,7 +843,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H7'  => 'Horizon',
         '4H'  => 'Horizont',
         'HO'  => 'Hosin',
-        'H3'  => 'Hotel',
+        'H3'  => 'Hotel TV Company',
         'HV'  => 'Hotwav',
         'U8'  => 'Hot Pepper',
         'HOT' => 'HOTACK',
@@ -1007,6 +1000,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'K6'  => 'Kanji',
         'KA'  => 'Karbonn',
         'K5'  => 'KATV1',
+        'ROI' => 'KAP',
         'KAP' => 'Kapsys',
         'K0'  => 'Kata',
         'KZ'  => 'Kazam',
@@ -1024,6 +1018,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'K1'  => 'Kiano',
         'KID' => 'kidiby',
         '5W'  => 'Kingbox',
+        'S4'  => 'Kingelon',
         'KI'  => 'Kingsun',
         'KIS' => 'Kinstone',
         'KF'  => 'KINGZONE',
@@ -1122,7 +1117,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'LOG' => 'Logik',
         'LGT' => 'Logitech',
         'GY'  => 'LOKMAT',
-        'LPX' => 'LPX-G',
         '0L'  => 'Lumigon',
         'LU'  => 'Lumus',
         'LUM' => 'Lumitel',
@@ -1177,7 +1171,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'FK'  => 'MBI',
         'MBK' => 'MBK',
         '3D'  => 'MDC Store',
-        '1Y'  => 'MDTV',
+        '1Y'  => 'OTT',
         '09'  => 'meanIT',
         'M3'  => 'Mecer',
         'M3M' => 'M3 Mobile',
@@ -1224,8 +1218,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'MIW' => 'MIWANG',
         'ML'  => 'MLLED',
         'LS'  => 'MLS',
-        'MLA' => 'MLAB',
-        '5H'  => 'MMI',
+        'MLA' => 'Microlab',
         '4M'  => 'Mobicel',
         'M6'  => 'Mobiistar',
         'MOK' => 'Mobile Kingdom',
@@ -1428,10 +1421,10 @@ abstract class AbstractDeviceParser extends AbstractParser
         'O6'  => 'Oyyu',
         'OZ'  => 'OzoneHD',
         'OLL' => 'Ollee',
-        '7P'  => 'P-UP',
+        '7P'  => 'Mode 1',
         'PRA' => 'Pacific Research Alliance',
         'PAG' => 'PAGRAER',
-        'PAD' => 'Padpro',
+        'PAD' => '7Ke tree',
         'YP'  => 'Paladin',
         'PM'  => 'Palm',
         'PN'  => 'Panacom',
@@ -1452,11 +1445,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'PC'  => 'PCD',
         'PD'  => 'PCD Argentina',
         'PE'  => 'PEAQ',
+        '8J'  => 'Pelitt',
         'PEN' => 'Penta',
         'PG'  => 'Pentagram',
         'PQ'  => 'Pendoo',
         '93'  => 'Perfeo',
-        '8J'  => 'Pelitt',
         '1P'  => 'Phicomm',
         '4P'  => 'Philco',
         'PH'  => 'Philips',
@@ -1495,6 +1488,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '3P'  => 'Positivo BGH',
         '3F'  => 'Porsche',
         'PRT' => 'Portfolio',
+        'DRE' => 'Powerway',
         'PPD' => 'PPDS',
         'P3'  => 'PPTV',
         'FP'  => 'Premio',
@@ -1528,10 +1522,11 @@ abstract class AbstractDeviceParser extends AbstractParser
         'QM'  => 'QMobile',
         'QT'  => 'Qtek',
         'Q9'  => 'QTECH',
+        '84'  => 'Quanta Computer',
         'QA'  => 'Quantum',
-        'QUE' => 'Quest',
         'QUA' => 'Quatro',
         'QU'  => 'Quechua',
+        'QUE' => 'Quest',
         'QUI' => 'Quipus',
         'QO'  => 'Qumo',
         'UQ'  => 'Qubo',
@@ -1589,13 +1584,12 @@ abstract class AbstractDeviceParser extends AbstractParser
         'ROC' => 'Roam Cat',
         'ROT' => 'Rocket',
         'R1'  => 'Rokit',
-        'ROI' => 'ROiK',
         'RK'  => 'Roku',
         'R3'  => 'Rombica',
         'RUA' => 'Romsat',
         'R5'  => 'Ross&Moor',
         'RO'  => 'Rover',
-        'R6'  => 'RoverPad',
+        'R6'  => 'Rover Computers',
         'RQ'  => 'RoyQueen',
         'RJ'  => 'Royole',
         'RT'  => 'RT Project',
@@ -1726,17 +1720,15 @@ abstract class AbstractDeviceParser extends AbstractParser
         '68'  => 'Soho Style',
         'SOB' => 'SobieTech',
         'SOW' => 'SOWLY',
-        'PK'  => 'Spark',
+        'PK'  => 'Spark NZ',
         'SPX' => 'Sparx',
         'FS'  => 'SPC',
         '6S'  => 'Spectrum',
         '43'  => 'Spectralink',
         'SP'  => 'Spice',
         'SPD' => 'Spider',
-        '84'  => 'Sprint',
         'SPU' => 'SPURT',
         'QS'  => 'SQOOL',
-        'S4'  => 'Star',
         'OL'  => 'Starlight',
         'STA' => 'Star-Light',
         '18'  => 'Starmobile',
@@ -1747,7 +1739,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'GQ'  => 'STG Telecom',
         'S2'  => 'Stonex',
         'ST'  => 'Storex',
-        'STR' => 'Stream',
+        'STR' => 'StreamSystem',
         '71'  => 'StrawBerry',
         '96'  => 'STRONG',
         '69'  => 'Stylo',
@@ -1788,6 +1780,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'SM'  => 'Symphony',
         '4S'  => 'Syrox',
         'SYS' => 'System76',
+        'TPS' => 'SZ TPS',
         'TM'  => 'T-Mobile',
         'T96' => 'T96',
         'TAD' => 'TADAAM',
@@ -1806,13 +1799,12 @@ abstract class AbstractDeviceParser extends AbstractParser
         'H4'  => 'Technicolor',
         'TEA' => 'TeachTouch',
         'Z5'  => 'Technika',
-        'TE1' => 'TechSmart',
+        'TE1' => 'Techmade',
         'TX'  => 'TechniSat',
         'TT'  => 'TechnoTrend',
         'TTS' => 'TECHNOSAT',
         'TM1' => 'Temigereev',
         'TP'  => 'TechPad',
-        'TPS' => 'TPS',
         '9E'  => 'Techwood',
         '7F'  => 'Technopc',
         'TCH' => 'Techstorm',
@@ -1832,6 +1824,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'PW'  => 'Telpo',
         'TLS' => 'TeloSystems',
         'TER' => 'Teracube',
+        'WR'  => 'Terra',
         'TD'  => 'Tesco',
         'TA'  => 'Tesla',
         '9T'  => 'Tetratab',
@@ -1909,8 +1902,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'TV'  => 'TVC',
         'TVP' => 'TV+',
         'TW'  => 'TWM',
-        'Z1'  => 'TWZ',
-        '6T'  => 'Twoe',
+        'Z1'  => 'TWZ Corporation',
         'TWN' => 'TwinMOS',
         '15'  => 'Tymes',
         'UC'  => 'U.S. Cellular',
@@ -1932,6 +1924,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'UNI' => 'Unistrong',
         'U2'  => 'UNIWA',
         'UND' => 'Uniden',
+        'BAS' => 'Unikalne Smartphones',
         'UNE' => 'UNITED',
         'UGR' => 'United Group',
         'UO'  => 'Unnecto',
@@ -2035,7 +2028,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'VRX' => 'VORTEX (RO)',
         'VOR' => 'Vormor',
         'V1'  => 'Voto',
-        'Z7'  => 'VOX',
+        'Z7'  => 'VOX Electronics',
         'VOI' => 'VOIX',
         'VO'  => 'Voxtel',
         'VY'  => 'Voyo',
@@ -2058,7 +2051,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WAL' => 'Waltter',
         'WAI' => 'Wainyok',
         'WAT' => 'waipu.tv',
-        'WHI' => 'White Mobile',
         'WHO' => 'Whoop',
         'WBL' => 'We. by Loewe.',
         'WCP' => 'WeChip',
@@ -2069,7 +2061,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WD'  => 'Western Digital',
         'WST' => 'Weston',
         'WT'  => 'Westpoint',
-        'WAN' => 'Wanmukang',
+        'WAN' => 'Zhongyu Display',
         'WA1' => 'WANSA',
         'WY'  => 'Wexler',
         '3W'  => 'WE',
@@ -2096,7 +2088,6 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WON' => 'WONDER',
         'WO'  => 'Wonu',
         'W1'  => 'Woo',
-        'WR'  => 'Wortmann',
         'WX'  => 'Woxter',
         'WOZ' => 'WOZIFAN',
         'XQ'  => 'X-AGE',
@@ -2197,6 +2188,37 @@ abstract class AbstractDeviceParser extends AbstractParser
         // legacy brands, might be removed in future versions
         'WB'  => 'Web TV',
         'XX'  => 'Unknown',
+        // Brands that were "moved" to other brands by renaming and result in duplicates.
+        // Old names can be seen in $legacyShortNames
+        '6T'  => '2E',
+        '5H'  => 'ARRIS',
+        'WHI' => 'Cherry Mobile',
+        '6C'  => 'Cloudfone',
+        'DZ'  => 'Coolpad',
+        'ER'  => 'Ericsson',
+        'HLL' => 'Exertis',
+        'EKI' => 'iGet',
+        'LPX' => 'OTT',
+        'UE1' => 'Newman',
+    ];
+
+    /**
+     * List of short names, that are not used due to brand being moved to another one.
+     * Meant for merger with `$deviceBrands` in certain functions.
+     *
+     * @var array
+     */
+    public static $legacyShortNames = [
+        '6T'  => 'Twoe',
+        '5H'  => 'MMI',
+        'WHI' => 'White Mobile',
+        '6C'  => 'Cloudpad',
+        'DZ'  => 'Dazen',
+        'ER'  => 'Ericy',
+        'HLL' => 'HLLO',
+        'EKI' => 'EKINOX',
+        'LPX' => 'LPX-G',
+        'UE1' => 'UE',
     ];
 
     /**
@@ -2311,7 +2333,7 @@ public static function getFullName(string $brandId): string
      */
     public static function getShortCode(string $brand): string
     {
-        return (string) \array_search($brand, self::$deviceBrands, true) ?: '';
+        return (string) \array_search($brand, self::$legacyShortNames + self::$deviceBrands, true) ?: '';
     }
 
     /**
diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php
index 18c0859a3d..c87a638eb1 100644
--- a/Tests/DeviceDetectorTest.php
+++ b/Tests/DeviceDetectorTest.php
@@ -837,7 +837,7 @@ public function testCheckRegexRestrictionEndCondition(): void
      */
     public function testDuplicateBrands(): void
     {
-        $brands     = \array_map('strtolower', AbstractDeviceParser::$deviceBrands);
+        $brands     = \array_map('strtolower', AbstractDeviceParser::$legacyShortNames + AbstractDeviceParser::$deviceBrands);
         $unique     = \array_unique($brands);
         $duplicates = \array_diff_assoc($brands, $unique);
 
diff --git a/Tests/fixtures/car_browser.yml b/Tests/fixtures/car_browser.yml
index 41921622a8..0276913838 100644
--- a/Tests/fixtures/car_browser.yml
+++ b/Tests/fixtures/car_browser.yml
@@ -625,8 +625,8 @@
     engine_version: 110.0.0.0
   device:
     type: car browser
-    brand: ROiK
-    model: "10"
+    brand: KAP
+    model: ROiK-10
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
index 182da08b9a..0edea2882b 100644
--- a/Tests/fixtures/desktop.yml
+++ b/Tests/fixtures/desktop.yml
@@ -8536,7 +8536,7 @@
     engine_version: 103.0.0.0
   device:
     type: desktop
-    brand: Wanmukang
+    brand: Zhongyu Display
     model: ZC-339
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml
index f42327c83d..1e1dac8235 100644
--- a/Tests/fixtures/feature_phone.yml
+++ b/Tests/fixtures/feature_phone.yml
@@ -2775,8 +2775,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Bold
+    brand: Digit
+    model: Digit4G Bold
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2793,8 +2793,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Defender
+    brand: Digit
+    model: Digit4G Defender
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2811,8 +2811,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Elite
+    brand: Digit
+    model: Digit4G Elite
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2829,8 +2829,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Music
+    brand: Digit
+    model: Digit4G Music
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2847,8 +2847,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Power
+    brand: Digit
+    model: Digit4G Power
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2865,8 +2865,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Star
+    brand: Digit
+    model: Digit4G Star
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2883,8 +2883,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Lite
+    brand: Digit
+    model: Digit4G Lite
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2901,8 +2901,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Power Max
+    brand: Digit
+    model: Digit4G Power Max
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2919,8 +2919,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Shine
+    brand: Digit
+    model: Digit4G Shine
   os_family: Firefox OS
   browser_family: Firefox
 -
diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml
index 2b618bcaab..6134acdc27 100644
--- a/Tests/fixtures/phablet-1.yml
+++ b/Tests/fixtures/phablet-1.yml
@@ -2811,8 +2811,8 @@
     engine_version: 86.0.4240.110
   device:
     type: phablet
-    brand: P-UP
-    model: Mode 1 RR
+    brand: Mode 1
+    model: RR
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml
index 1eedf4ddec..960575f86f 100644
--- a/Tests/fixtures/phablet.yml
+++ b/Tests/fixtures/phablet.yml
@@ -6220,8 +6220,8 @@
     engine_version: 86.0.4240.185
   device:
     type: phablet
-    brand: P-UP
-    model: Mode 1 RS
+    brand: Mode 1
+    model: RS
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml
index f8a1e3e046..1ed01288d0 100644
--- a/Tests/fixtures/smartphone-11.yml
+++ b/Tests/fixtures/smartphone-11.yml
@@ -6774,7 +6774,7 @@
     engine_version: 78.0.3904.96
   device:
     type: smartphone
-    brand: RoverPad
+    brand: Rover Computers
     model: ""
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-12.yml b/Tests/fixtures/smartphone-12.yml
index 5371ddfd0e..2b2328cb94 100644
--- a/Tests/fixtures/smartphone-12.yml
+++ b/Tests/fixtures/smartphone-12.yml
@@ -621,7 +621,7 @@
     engine_version: 43.0.2357.92
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N8800
   os_family: Android
   browser_family: Chrome
@@ -639,7 +639,7 @@
     engine_version: 40.0.2214.109
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9500
   os_family: Android
   browser_family: Chrome
@@ -657,7 +657,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9600
   os_family: Android
   browser_family: Android Browser
@@ -675,7 +675,7 @@
     engine_version: 34.0.1847.114
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9700
   os_family: Android
   browser_family: Chrome
@@ -693,7 +693,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9800
   os_family: Android
   browser_family: Android Browser
@@ -711,7 +711,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9977
   os_family: Android
   browser_family: Android Browser
@@ -729,8 +729,9 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: Star
-    model: Note 3
+    brand: Kingelon
+    #Previously "Note 3", probably because this is Samsung Note 3 clone, but officially it's N9000. Similar model was released as "Note 3" under 5Star brand
+    model: N9000
   os_family: Android
   browser_family: Chrome
 -
@@ -10783,8 +10784,8 @@
     engine_version: 104.0.0.0
   device:
     type: smartphone
-    brand: Digit4G
-    model: Play1
+    brand: Digit
+    model: Digit4G Play1
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml
index dc764050e4..b8d88265e5 100644
--- a/Tests/fixtures/smartphone-15.yml
+++ b/Tests/fixtures/smartphone-15.yml
@@ -9532,8 +9532,9 @@
     engine_version: 103.0.0.0
   device:
     type: smartphone
-    brand: H133
-    model: Betacrux
+    brand: Ceibal
+    #https://ceibal.edu.uy/institucional/articulos/hardware-beta-crux/
+    model: H133 Beta Crux
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml
index 2c7c3d8e3c..2caeb31d27 100644
--- a/Tests/fixtures/smartphone-19.yml
+++ b/Tests/fixtures/smartphone-19.yml
@@ -3073,7 +3073,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: F534L
   os_family: Android
   browser_family: Chrome
@@ -3091,7 +3091,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: F572L
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml
index ec4b01d968..504719920c 100644
--- a/Tests/fixtures/smartphone-2.yml
+++ b/Tests/fixtures/smartphone-2.yml
@@ -9300,7 +9300,7 @@
     engine_version: 87.0.4280.141
   device:
     type: smartphone
-    brand: Spark
+    brand: Spark NZ
     model: Plus 3
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml
index 02b2b91941..1256b5e8e7 100644
--- a/Tests/fixtures/smartphone-21.yml
+++ b/Tests/fixtures/smartphone-21.yml
@@ -2765,7 +2765,7 @@
     engine_version: 76.0.3809.89
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y60
   os_family: Android
   browser_family: Chrome
@@ -2783,7 +2783,7 @@
     engine_version: 75.0.3770.143
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y68
   os_family: Android
   browser_family: Chrome
@@ -2801,7 +2801,7 @@
     engine_version: 71.0.3578.99
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A49
   os_family: Android
   browser_family: Opera
@@ -2819,7 +2819,7 @@
     engine_version: 73.0.3683.90
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A55
   os_family: Android
   browser_family: Chrome
@@ -2837,7 +2837,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A567
   os_family: Android
   browser_family: Chrome
@@ -2855,7 +2855,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: AA8
   os_family: Android
   browser_family: Android Browser
@@ -2873,7 +2873,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: QQ2
   os_family: Android
   browser_family: Chrome
@@ -2891,7 +2891,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: QQ1
   os_family: Android
   browser_family: Chrome
@@ -2909,7 +2909,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A95
   os_family: Android
   browser_family: Android Browser
@@ -2927,7 +2927,7 @@
     engine_version: 39.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y52
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml
index 58e6273874..85ede81ed1 100644
--- a/Tests/fixtures/smartphone-22.yml
+++ b/Tests/fixtures/smartphone-22.yml
@@ -1183,8 +1183,8 @@
     engine_version: ""
   device:
     type: smartphone
-    brand: Hisense
-    model: Smartfren Andromax U2
+    brand: Smartfren
+    model: Andromax U2
   os_family: Android
   browser_family: Opera
 -
@@ -5963,7 +5963,7 @@
     engine_version: 89.0.4389.90
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: E500A
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml
index e6e89cd3e0..909c059eed 100644
--- a/Tests/fixtures/smartphone-23.yml
+++ b/Tests/fixtures/smartphone-23.yml
@@ -3541,8 +3541,8 @@
     engine_version: 67.0.3396.87
   device:
     type: smartphone
-    brand: P-UP
-    model: Mode 1 MD-01P
+    brand: Mode 1
+    model: MD-01P
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml
index e84d5fafd6..53d60c8bb9 100644
--- a/Tests/fixtures/smartphone-28.yml
+++ b/Tests/fixtures/smartphone-28.yml
@@ -2639,7 +2639,7 @@
     engine_version: 94.0.4606.85
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Stratus C5
   os_family: Android
   browser_family: Chrome
@@ -2675,7 +2675,7 @@
     engine_version: 95.0.4638.74
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Cyclone C4
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
index 916fb8f457..ddb820bb33 100644
--- a/Tests/fixtures/smartphone-3.yml
+++ b/Tests/fixtures/smartphone-3.yml
@@ -10710,8 +10710,8 @@
     engine_version: 94.0.4606.71
   device:
     type: smartphone
-    brand: Dazen
-    model: 6A
+    brand: Coolpad
+    model: Dazen 6A
   os_family: Android
   browser_family: Chrome
 -
@@ -12652,7 +12652,7 @@
     engine_version: 89.0.4389.105
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Storm C3
   os_family: Android
   browser_family: Chrome
@@ -12866,7 +12866,7 @@
     engine_version: 96.0.4664.45
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Stratus C5 Elite
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml
index 3ecd824f22..2aef8db01c 100644
--- a/Tests/fixtures/smartphone-31.yml
+++ b/Tests/fixtures/smartphone-31.yml
@@ -445,7 +445,7 @@
     engine_version: 80.0.3987.99
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Cirrus C2
   os_family: Android
   browser_family: Chrome
@@ -9813,7 +9813,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: B3 Maxi
   os_family: Android
   browser_family: Chrome
@@ -9831,7 +9831,7 @@
     engine_version: 84.0.4147.89
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: B3 Simply
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml
index 4b2e80df6a..ac875fe938 100644
--- a/Tests/fixtures/smartphone-32.yml
+++ b/Tests/fixtures/smartphone-32.yml
@@ -8617,7 +8617,7 @@
     engine_version: 87.0.4280.101
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: B3 Pro
   os_family: Android
   browser_family: Chrome
@@ -9085,7 +9085,7 @@
     engine_version: 86.0.4240.185
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: B1s
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml
index 0a54f7c5de..0137b99946 100644
--- a/Tests/fixtures/smartphone-33.yml
+++ b/Tests/fixtures/smartphone-33.yml
@@ -5391,7 +5391,7 @@
     engine_version: 86.0.4240.99
   device:
     type: smartphone
-    brand: White Mobile
+    brand: Cherry Mobile
     model: Omega Lite 3
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml
index a0846e9b55..dc534dbdd4 100644
--- a/Tests/fixtures/smartphone-34.yml
+++ b/Tests/fixtures/smartphone-34.yml
@@ -6991,7 +6991,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9589
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml
index a27321e1e5..3626ab6c6f 100644
--- a/Tests/fixtures/smartphone-35.yml
+++ b/Tests/fixtures/smartphone-35.yml
@@ -659,7 +659,7 @@
     engine_version: 80.0.3987.162
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: OX X1
   os_family: Android
   browser_family: Chrome
@@ -2063,7 +2063,7 @@
     engine_version: 111.0.0.0
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Stratus C7
   os_family: Android
   browser_family: Chrome
@@ -8015,7 +8015,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: HT28
   os_family: Android
   browser_family: Chrome
@@ -8031,7 +8031,7 @@
     version: 305.0.0.12.106
   device:
     type: smartphone
-    brand: Stream
+    brand: StreamSystem
     model: HT16
   os_family: Android
   browser_family: Unknown
diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml
index 1dd018f07f..ea6e20eaca 100644
--- a/Tests/fixtures/smartphone-36.yml
+++ b/Tests/fixtures/smartphone-36.yml
@@ -211,8 +211,8 @@
     engine_version: 87.0.4280.101
   device:
     type: smartphone
-    brand: EKINOX
-    model: E8 Ultra
+    brand: iGet
+    model: EKINOX E8 Ultra
   os_family: Android
   browser_family: Chrome
 -
@@ -4657,8 +4657,8 @@
     engine_version: 84.0.4147.111
   device:
     type: smartphone
-    brand: TechSmart
-    model: T6
+    brand: Techmade
+    model: TechSmart T6
   os_family: Android
   browser_family: Chrome
 -
@@ -4675,8 +4675,8 @@
     engine_version: 76.0.3809.111
   device:
     type: smartphone
-    brand: TechSmart
-    model: T5+
+    brand: Techmade
+    model: TechSmart T5+
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml
index 8e4c2c398a..2979220ec9 100644
--- a/Tests/fixtures/smartphone-37.yml
+++ b/Tests/fixtures/smartphone-37.yml
@@ -2015,8 +2015,8 @@
     engine_version: "533.1"
   device:
     type: smartphone
-    brand: BASE
-    model: Varia
+    brand: Unikalne Smartphones
+    model: BASE Varia
   os_family: Android
   browser_family: Android Browser
 -
@@ -4343,8 +4343,8 @@
     engine_version: 57.0.2987.108
   device:
     type: smartphone
-    brand: Digit4G
-    model: E3 Pro
+    brand: Digit
+    model: Digit4G E3 Pro
   os_family: Android
   browser_family: Unknown
 -
@@ -4379,8 +4379,8 @@
     engine_version: 61.0.3163.98
   device:
     type: smartphone
-    brand: Digit4G
-    model: E2 Pro
+    brand: Digit
+    model: Digit4G E2 Pro
   os_family: Android
   browser_family: Opera
 -
@@ -7235,8 +7235,8 @@
     engine_version: 120.0.6099.193
   device:
     type: smartphone
-    brand: Digit4G
-    model: Infinity
+    brand: Digit
+    model: Digit4G Infinity
   os_family: Android
   browser_family: Chrome
 -
@@ -7253,8 +7253,8 @@
     engine_version: 105.0.5195.136
   device:
     type: smartphone
-    brand: Digit4G
-    model: Infinity Max
+    brand: Digit
+    model: Digit4G Infinity Max
   os_family: Android
   browser_family: Chrome
 -
@@ -7271,8 +7271,8 @@
     engine_version: 120.0.6099.193
   device:
     type: smartphone
-    brand: Digit4G
-    model: Glory1
+    brand: Digit
+    model: Digit4G Glory1
   os_family: Android
   browser_family: Chrome
 -
@@ -7289,8 +7289,8 @@
     engine_version: 91.0.4472.114
   device:
     type: smartphone
-    brand: Digit4G
-    model: Energy Max
+    brand: Digit
+    model: Digit4G Energy Max
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml
index 097f52149c..05c00713d1 100644
--- a/Tests/fixtures/smartphone-39.yml
+++ b/Tests/fixtures/smartphone-39.yml
@@ -1291,8 +1291,8 @@
     engine_version: 111.0.0.0
   device:
     type: smartphone
-    brand: Digit4G
-    model: Next Ultra
+    brand: Digit
+    model: Digit4G Next Ultra
   os_family: Android
   browser_family: Chrome
 -
@@ -1309,8 +1309,8 @@
     engine_version: 106.0.0.0
   device:
     type: smartphone
-    brand: Digit4G
-    model: E4 Pro
+    brand: Digit
+    model: Digit4G E4 Pro
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml
index c2f34ea707..c9cb9d0194 100644
--- a/Tests/fixtures/smartphone-41.yml
+++ b/Tests/fixtures/smartphone-41.yml
@@ -6642,7 +6642,7 @@
     engine_version: 85.0.4183.69
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Stratus C8
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
index 5602f9ee13..25c037ee07 100644
--- a/Tests/fixtures/smartphone-5.yml
+++ b/Tests/fixtures/smartphone-5.yml
@@ -2987,8 +2987,8 @@
     engine_version: ""
   device:
     type: smartphone
-    brand: Hisense
-    model: Smartfren Andromax R
+    brand: Smartfren
+    model: Andromax R
   os_family: Android
   browser_family: Android Browser
 -
@@ -3005,8 +3005,8 @@
     engine_version: 59.0.3071.125
   device:
     type: smartphone
-    brand: Hisense
-    model: Smartfren Andromax Z
+    brand: Smartfren
+    model: Andromax Z
   os_family: Android
   browser_family: Chrome
 -
@@ -9952,7 +9952,7 @@
     engine_version: 100.0.4896.127
   device:
     type: smartphone
-    brand: Cloud
+    brand: Cloud Mobile
     model: Typhoon C6
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml
index 67d4313221..8f0dae4d35 100644
--- a/Tests/fixtures/smartphone-7.yml
+++ b/Tests/fixtures/smartphone-7.yml
@@ -9147,8 +9147,8 @@
     engine_version: 61.0.3163.98
   device:
     type: smartphone
-    brand: Digit4G
-    model: Energy
+    brand: Digit
+    model: Digit4G Energy
   os_family: Android
   browser_family: Opera
 -
@@ -9165,8 +9165,8 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Digit4G
-    model: Pro
+    brand: Digit
+    model: Digit4G Pro
   os_family: Android
   browser_family: Unknown
 -
diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
index 91163fa844..fae5bb3953 100644
--- a/Tests/fixtures/smartphone.yml
+++ b/Tests/fixtures/smartphone.yml
@@ -4261,7 +4261,7 @@
     engine_version: 79.0.3945.93
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: E450R
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml
index 576624e24f..d5deb1092b 100644
--- a/Tests/fixtures/tablet-1.yml
+++ b/Tests/fixtures/tablet-1.yml
@@ -3071,8 +3071,8 @@
     engine_version: "535.19"
   device:
     type: tablet
-    brand: Crius Mea
-    model: Q7A
+    brand: Ooredoo
+    model: Crius Mea Q7A
   os_family: Android
   browser_family: Chrome
 -
@@ -3089,8 +3089,8 @@
     engine_version: "534.30"
   device:
     type: tablet
-    brand: Crius Mea
-    model: Q7A+
+    brand: Ooredoo
+    model: Crius Mea Q7A+
   os_family: Android
   browser_family: Android Browser
 -
diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml
index 6ca77c8f50..f6ca3b465d 100644
--- a/Tests/fixtures/tablet-10.yml
+++ b/Tests/fixtures/tablet-10.yml
@@ -3221,7 +3221,7 @@
     engine_version: 76.0.3809.111
   device:
     type: tablet
-    brand: TWZ
+    brand: TWZ Corporation
     model: TabPlay 125
   os_family: Android
   browser_family: Chrome
@@ -3239,7 +3239,7 @@
     engine_version: 55.0.2883.91
   device:
     type: tablet
-    brand: TWZ
+    brand: TWZ Corporation
     model: TabPlay 126
   os_family: Android
   browser_family: Chrome
@@ -6407,7 +6407,7 @@
     engine_version: 30.0.0.0
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Sky 7.85" 3G
   os_family: Android
   browser_family: Chrome
@@ -6515,7 +6515,7 @@
     engine_version: 66.0.3359.158
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Sky 7.85" 3G
   os_family: Android
   browser_family: Chrome
@@ -7649,8 +7649,8 @@
     engine_version: 75.0.3770.143
   device:
     type: tablet
-    brand: Cloudpad
-    model: +VT107C
+    brand: Cloudfone
+    model: Cloudpad C701TV+
   os_family: Android
   browser_family: Chrome
 -
@@ -7667,8 +7667,8 @@
     engine_version: 79.0.3945.93
   device:
     type: tablet
-    brand: Cloudpad
-    model: +VTQ007C
+    brand: Cloudfone
+    model: Cloudpad C700QTV+
   os_family: Android
   browser_family: Chrome
 -
@@ -9269,8 +9269,8 @@
     engine_version: 80.0.3987.119
   device:
     type: tablet
-    brand: High Q
-    model: ELT0704H
+    brand: EPIK Learning
+    model: HighQ ELT0704H
   os_family: Android
   browser_family: Chrome
 -
@@ -9287,8 +9287,8 @@
     engine_version: 81.0.4044.117
   device:
     type: tablet
-    brand: High Q
-    model: ELT0706H
+    brand: EPIK Learning
+    model: HighQ ELT0706H
   os_family: Android
   browser_family: Chrome
 -
@@ -9305,8 +9305,8 @@
     engine_version: 81.0.4044.138
   device:
     type: tablet
-    brand: High Q
-    model: ELT0802H
+    brand: EPIK Learning
+    model: HighQ ELT0802H
   os_family: Android
   browser_family: Chrome
 -
@@ -10655,8 +10655,8 @@
     engine_version: 79.0.3945.136
   device:
     type: tablet
-    brand: Wortmann
-    model: Terra Pad 1005
+    brand: Terra
+    model: Pad 1005
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml
index ab63ebf598..03dfd02cb9 100644
--- a/Tests/fixtures/tablet-11.yml
+++ b/Tests/fixtures/tablet-11.yml
@@ -4589,7 +4589,7 @@
     engine_version: 124.0.6367.82
   device:
     type: tablet
-    brand: Padpro
+    brand: 7Ke tree
     model: GT40 Pro Max
   os_family: Android
   browser_family: Opera
@@ -6419,8 +6419,8 @@
     engine_version: 124.0.6367.179
   device:
     type: tablet
-    brand: Wortmann
-    model: Terra Pad 1200 V2
+    brand: Terra
+    model: Pad 1200 V2
   os_family: Android
   browser_family: Opera
 -
diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml
index 3ad189c8de..e20d9d8f02 100644
--- a/Tests/fixtures/tablet-2.yml
+++ b/Tests/fixtures/tablet-2.yml
@@ -9184,8 +9184,8 @@
     engine_version: 76.0.3809.111
   device:
     type: tablet
-    brand: DreamTab
-    model: DRN-809
+    brand: Powerway
+    model: Dreamtab DRN-809
   os_family: Android
   browser_family: Chrome
 -
@@ -9202,8 +9202,8 @@
     engine_version: 72.0.3626.121
   device:
     type: tablet
-    brand: DreamTab
-    model: DRN-709
+    brand: Powerway
+    model: Dreamtab DRN-709
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml
index 5191a914f7..f6065c0ba9 100644
--- a/Tests/fixtures/tablet-3.yml
+++ b/Tests/fixtures/tablet-3.yml
@@ -8693,7 +8693,7 @@
     engine_version: 76.0.3809.132
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: ""
   os_family: Android
   browser_family: Unknown
@@ -8711,7 +8711,7 @@
     engine_version: 35.0.1916.122
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: "10.4"
   os_family: Android
   browser_family: Chrome
@@ -8729,7 +8729,7 @@
     engine_version: "533.1"
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: 3W A73
   os_family: Android
   browser_family: Android Browser
@@ -8747,7 +8747,7 @@
     engine_version: "534.30"
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: 3W7
   os_family: Android
   browser_family: Android Browser
@@ -8765,7 +8765,7 @@
     engine_version: "534.30"
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: 3W9.4
   os_family: Android
   browser_family: Android Browser
@@ -8783,7 +8783,7 @@
     engine_version: "530.17"
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: 3WT70
   os_family: Android
   browser_family: Android Browser
@@ -8801,7 +8801,7 @@
     engine_version: 71.0.3578.99
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: 9.7 3G
   os_family: Android
   browser_family: Opera
@@ -8819,7 +8819,7 @@
     engine_version: "537.31"
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Air S70
   os_family: Android
   browser_family: Chrome
@@ -8837,7 +8837,7 @@
     engine_version: 30.0.0.0
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Sky 7.85" 3G
   os_family: Android
   browser_family: Chrome
@@ -8855,7 +8855,7 @@
     engine_version: 70.0.3538.110
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Sky 9.7
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml
index 513f1da56e..8dd5202170 100644
--- a/Tests/fixtures/tablet-5.yml
+++ b/Tests/fixtures/tablet-5.yml
@@ -1111,8 +1111,8 @@
     engine_version: 79.0.3945.79
   device:
     type: tablet
-    brand: Wortmann
-    model: Terra Pad 1004
+    brand: Terra
+    model: Pad 1004
   os_family: Android
   browser_family: Chrome
 -
@@ -5231,7 +5231,7 @@
     engine_version: 80.0.3987.117
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Pro Q8 LTE
   os_family: Android
   browser_family: Chrome
@@ -5249,7 +5249,7 @@
     engine_version: 83.0.4103.83
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Pro Q10 LTE
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml
index 375bf80993..2e5cd32bcc 100644
--- a/Tests/fixtures/tablet-6.yml
+++ b/Tests/fixtures/tablet-6.yml
@@ -1920,8 +1920,8 @@
     engine_version: 81.0.4044.111
   device:
     type: tablet
-    brand: Sprint
-    model: AQT100
+    brand: Quanta Computer
+    model: Slate AQT100
   os_family: Android
   browser_family: Chrome
 -
@@ -1938,8 +1938,8 @@
     engine_version: 83.0.4103.96
   device:
     type: tablet
-    brand: Sprint
-    model: AQT80
+    brand: Quanta Computer
+    model: Slate AQT80
   os_family: Android
   browser_family: Chrome
 -
@@ -1956,8 +1956,8 @@
     engine_version: 84.0.4147.89
   device:
     type: tablet
-    brand: Sprint
-    model: AQT82
+    brand: Quanta Computer
+    model: Slate AQT82
   os_family: Android
   browser_family: Chrome
 -
@@ -6560,7 +6560,7 @@
     engine_version: 94.0.4606.85
   device:
     type: tablet
-    brand: Cloud
+    brand: Cloud Mobile
     model: Sunshine T1
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml
index 11d64ac0f4..6c5d65b5fc 100644
--- a/Tests/fixtures/tablet-7.yml
+++ b/Tests/fixtures/tablet-7.yml
@@ -103,8 +103,8 @@
     engine_version: 95.0.4638.74
   device:
     type: tablet
-    brand: Wortmann
-    model: Terra Pad 1006
+    brand: Terra
+    model: Pad 1006
   os_family: Android
   browser_family: Chrome
 -
@@ -4833,7 +4833,7 @@
     engine_version: 42.0.2311.111
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Air 7.85" 3G
   os_family: Android
   browser_family: Chrome
@@ -4851,7 +4851,7 @@
     engine_version: 71.0.3578.99
   device:
     type: tablet
-    brand: RoverPad
+    brand: Rover Computers
     model: Art 7.85" 3G
   os_family: Android
   browser_family: Chrome
@@ -6219,8 +6219,8 @@
     engine_version: 100.0.4896.127
   device:
     type: tablet
-    brand: HLLO
-    model: SMB-H8009
+    brand: Exertis
+    model: HLLO SMB-H8009
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml
index dbde43b733..a9c5ea8cc2 100644
--- a/Tests/fixtures/tablet-8.yml
+++ b/Tests/fixtures/tablet-8.yml
@@ -4007,7 +4007,7 @@
     engine_version: 102.0.0.0
   device:
     type: tablet
-    brand: Cloud
+    brand: Cloud Mobile
     model: Sunshine T1 Elite
   os_family: Android
   browser_family: Chrome
@@ -9348,9 +9348,10 @@
     engine: Blink
     engine_version: 79.0.3945.93
   device:
+    #Previously "UE" brand, but based on spoiler https://4pda.to/forum/index.php?showtopic=740550 and several retailers (including https://www.youtube.com/watch?v=SD_qRgUTkxw) selling it as "UE 1 PAD", "Newman" is most likely more correct
     type: tablet
-    brand: UE
-    model: Pad 1
+    brand: Newman
+    model: UE 1 PAD
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml
index d66cdd151c..4106b2fac7 100644
--- a/Tests/fixtures/tablet-9.yml
+++ b/Tests/fixtures/tablet-9.yml
@@ -7247,7 +7247,7 @@
     engine_version: 78.0.3904.96
   device:
     type: tablet
-    brand: TPS
+    brand: SZ TPS
     model: SC10
   os_family: Android
   browser_family: Chrome
@@ -8363,7 +8363,7 @@
     engine_version: 112.0.0.0
   device:
     type: tablet
-    brand: MLAB
+    brand: Microlab
     model: Glowy 10
   os_family: Android
   browser_family: Chrome
diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml
index 9c04bfe6bf..a1c48bc121 100644
--- a/Tests/fixtures/tv-1.yml
+++ b/Tests/fixtures/tv-1.yml
@@ -3389,8 +3389,8 @@
     engine_version: 95.0.4638.74
   device:
     type: tv
-    brand: MDTV
-    model: ""
+    brand: OTT
+    model: MDTV
   os_family: Android
   browser_family: Chrome
 -
@@ -4944,7 +4944,8 @@
     engine_version: 2.10.250
   device:
     type: tv
-    brand: MMI
+    #Previously "MMI", but apparently MMI is a pairing mode https://www.verizon.com/supportresources/content/dam/verizon/support/consumer/documents/vms1100_install_ops_manual-s.pdf
+    brand: ARRIS
     model: VMS1100
   os_family: GNU/Linux
   browser_family: Opera
diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml
index 5a5baa84e5..f857b27aa4 100644
--- a/Tests/fixtures/tv-2.yml
+++ b/Tests/fixtures/tv-2.yml
@@ -49,8 +49,8 @@
     engine_version: 78.0.3904.96
   device:
     type: tv
-    brand: LPX-G
-    model: Box Max
+    brand: OTT
+    model: LPX-G Box Max
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml
index 1a1707bad0..a1c829fc68 100644
--- a/Tests/fixtures/tv-4.yml
+++ b/Tests/fixtures/tv-4.yml
@@ -2447,7 +2447,7 @@
     engine_version: 68.0.3440.106
   device:
     type: tv
-    brand: Stream
+    brand: StreamSystem
     model: WSTRF4022FTP
   os_family: Other Mobile
   browser_family: Unknown
@@ -2465,7 +2465,7 @@
     engine_version: 68.0.3440.106
   device:
     type: tv
-    brand: Stream
+    brand: StreamSystem
     model: WSTRH3222FTP
   os_family: Other Mobile
   browser_family: Unknown
@@ -2483,7 +2483,7 @@
     engine_version: 68.0.3440.106
   device:
     type: tv
-    brand: Stream
+    brand: StreamSystem
     model: WSTRU4322FTP
   os_family: Other Mobile
   browser_family: Unknown
@@ -2501,7 +2501,7 @@
     engine_version: 68.0.3440.106
   device:
     type: tv
-    brand: Stream
+    brand: StreamSystem
     model: WSTRU5522FTP
   os_family: Other Mobile
   browser_family: Unknown
@@ -7892,7 +7892,7 @@
     engine_version: 108.0.5359.128
   device:
     type: tv
-    brand: VOX
+    brand: VOX Electronics
     model: ""
   os_family: GNU/Linux
   browser_family: Opera
diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml
index d20f457245..f387fa8d6e 100644
--- a/Tests/fixtures/tv.yml
+++ b/Tests/fixtures/tv.yml
@@ -64,7 +64,7 @@
     engine_version: 2.6.33
   device:
     type: tv
-    brand: Hotel
+    brand: Hotel TV Company
     model: ""
   os_family: GNU/Linux
   browser_family: Opera
@@ -1547,7 +1547,7 @@
   client: null
   device:
     type: tv
-    brand: DMM
+    brand: Dream Multimedia
     model: Dreambox
   os_family: GNU/Linux
   browser_family: Unknown
@@ -6976,7 +6976,7 @@
     engine_version: 44.0.2403.130
   device:
     type: tv
-    brand: Hotel
+    brand: Hotel TV Company
     model: ""
   os_family: GNU/Linux
   browser_family: Opera
@@ -7840,7 +7840,7 @@
     engine_version: 53.0.2785.143
   device:
     type: tv
-    brand: VOX
+    brand: VOX Electronics
     model: Smart TV (2017)
   os_family: GNU/Linux
   browser_family: Opera
diff --git a/misc/updateReadme.php b/misc/updateReadme.php
index c54b86d6cc..497f002eea 100644
--- a/misc/updateReadme.php
+++ b/misc/updateReadme.php
@@ -22,7 +22,7 @@
 
 include __DIR__ . '/../vendor/autoload.php';
 
-$brands = AbstractDeviceParser::$deviceBrands;
+$brands = array_unique(AbstractDeviceParser::$deviceBrands);
 natcasesort($brands);
 
 $bots      = [];
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index 94a6c9b4a6..808f491f39 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -114,9 +114,9 @@ Adronix:
     - regex: 'Adronix[ _]?(MT[0-9]+|X1001)(?:[);/ ]|$)'
       model: '$1'
 
-# Cherry Mobile (cherrymobile.com)
+# Cherry Mobile (cherrymobile.com, defunct site).
 Cherry Mobile:
-  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(Selfie|2\.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD[ _][345]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Aqua S10|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3'
+  regex: 'Cherry|Superion[_ ](?:S2|Radar Deluxe|S1 DTV|S1 Plus DTV|Tab Pro)|Flare([ _])?(Selfie|2\.[01]|2X|4|A[123]|J[1235678]|P[13]|S[4-8]|X2|Y[3567]|S[ _]Play|HD|LITE|XL|X_V[23]|Y3s|Tab|INFINITY)(?:[ _](?:Pro|Plus|Max|LTE))?|Fusion Aura 3s|Radar Deluxe 2|Desire R[678]|Desire_R[67]_Lite|Fusion Bolt|Omega[_ ](?:Icon 2|Icon Lite 2|lite[_ ][243][Cs]?|HD[ _][345]|HD_Duo|X)|Spin Max 2|Selfie_Two|Flare X Lite|Flare_5|Android 1.*Aqua S9|Aqua S10|MAIA PAD PLUS|COSMOS THREE| Revel 3G|Touch XL 2|DSR_(?:R8|R7P?)|CUBIX CUBE 3|AM1010V'
   device: 'smartphone'
   models:
     - regex: '(Flare2X|Aqua S(?:9|10)(?: (?:Max|Lite|Pro))?)'
@@ -241,6 +241,10 @@ Cherry Mobile:
     - regex: 'Cherry(?:[ _]?Mobile)?[ _]?([^/;]+)(?: Build|[);])'
       model: '$1'
 
+      #Previously listed as "White Mobile" brand, but based on https://firmwarefile.com/cherry-mobile-omega-lite-3, https://forum.gsmhosting.com/vbb/f296/cherry-mobile-omega-lite-3-frp-remove-2259709/ and https://deviceatlas.com/device-data/devices/white-mobile/am1010v/30376111 (and others), this is likely "Cherry Mobile", especially since I was not able to find any evidence of "White Mobile" ever existing.
+    - regex: 'AM1010V'
+      model: 'Omega Lite 3'
+
 # HTC (htc.com)
 HTC:
   regex: 'HTC|Sprint (?:APA|ATP)|ADR(?!910L)[a-z0-9]+|NexusHD2|Amaze[ _]4G(?:[);/ ]|$)|(Desire|Sensation|Evo ?3D|IncredibleS|Wildfire|Butterfly)[ _]?([^;/)]+)(?: Build|\))|(Amaze[ _]4G|(?<!BLU LIFE |ZOPO )One ?[XELSV\+]+)(?:[);/ ]|$)|SPV E6[05]0|(One M8|One Mini 2|X525a|PG86100|PC36100|XV6975|PJ83100|2PYB2|2PS64|2PZC5|0PJA10|0PJA2|HTV33|0PM92|0PCV1|601HT|0PAJ5|HTL2[23]|HTV3[12]|2PQ93|X2-HT|EXODUS 1|ISW13HT|710C|U Ultra|2Q8L10000|2Q55100|2QC9200|2PZC100|2PZF1|2PZM3|2Q6E1|U12 life|U Play)(?:[);/ ]|$)'
@@ -3495,9 +3499,14 @@ MEO:
 
 # Ooredoo (https://www.ooredoo.qa/)
 Ooredoo:
-  regex: 'Sagemcom DIW387_UHD_OOR(?:[);/ ]|$)' # Sagemcom DIW387
+  regex: 'Sagemcom DIW387_UHD_OOR|(Q7A\+?)(?:[);/ ]|$)' # Sagemcom DIW387
   device: 'tv'
-  model: 'TV Box'
+  models:
+    - regex: 'Sagemcom DIW387_UHD_OOR(?:[);/ ]|$)'
+      model: 'TV Box'
+    - regex: '(Q7A\+?)(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'Crius Mea $1'
 
 # Meu
 MEU:
@@ -3575,13 +3584,15 @@ Arnova:
 
 # ARRIS
 ARRIS:
-  regex: 'ARRIS'
+  regex: 'ARRIS|MMI, ([a-z0-9_ -]+), (?:wired|wireless)'
   device: 'tv'
   models:
     - regex: 'Arris_liberty,([a-z0-9-]+),(?:wired|wireless)'
       model: '$1'
     - regex: 'ARRIS[,;] ([^),;/]+)'
       model: '$1'
+    - regex: 'MMI, ([a-z0-9_ -]+), (?:wired|wireless)'
+      model: '$1'
 
 # Ask
 Ask:
@@ -6877,7 +6888,7 @@ Condor:
 
 # Coolpad (coolpad.us)
 Coolpad:
-  regex: '(?:YL-)?Coolpad|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3321AT|CP350[34]L|cp3636a|CP3648AT?|CP3667AT|CP3669AS|cp3705A[S]?|CP3706AS|CP23NV3|CP8298_I00|CP8676_I0[23]|C103|CP03|C1-U02|SAC-A0| 203[29]|CP0[57]|CP12[psQ]?)(?:[);/ ]|$)|(8295|5860S) Build'
+  regex: '(?:YL-)?Coolpad|dazen|(?:Cool_9S|1824-S0|8190Q|1831-A0|8676-[AM]01|1872-A0|REVVLPLUS C3701A|VCR-[AI]0|C105-(?:8|E0)|C106-[789]|C107-9| C106|MTS-T0|ORL-C0|DLS-E0|182[56]-I01|1825-E0| 1825|8298-(?:M02|A01)|5560S|CP3320AS2|CP3321AT|CP350[34]L|cp3636a|CP3648AT?|CP3667AT|CP3669AS|cp3705A[S]?|CP3706AS|CP23NV3|CP8298_I00|CP8676_I0[23]|C103|CP03|C1-U02|SAC-A0| 203[29]|CP0[57]|CP12[psQ]?)(?:[);/ ]|$)|(8295|5860S) Build'
   device: 'smartphone'
   models:
     - regex: 'CP23NV3'
@@ -6980,6 +6991,8 @@ Coolpad:
       model: '$1'
     - regex: '(?:YL-)?Coolpad[ _-]?([a-z0-9-]+)'
       model: '$1'
+    - regex: '6A'
+      model: 'Dazen 6A'
 
 # Clarmin (clarmin.com)
 Clarmin:
@@ -7089,12 +7102,6 @@ Cricket:
       device: 'feature phone'
       model: '$1'
 
-# Crius
-Crius Mea:
-  regex: '(Q7A\+?)(?:[);/ ]|$)'
-  device: 'tablet'
-  model: '$1'
-
 # Crosscall
 Crosscall:
   regex: 'Crosscall|ODYSSEY_Plus|Action-X[35]|Core-(?:M[45]|T[45]|X[345]|Z5)|Stellar-X5|Trekker-[MSX][1-4]|Odyssey S1'
@@ -7517,14 +7524,6 @@ Danew:
       device: 'tablet'
       model: 'DSlide $1'
 
-# Dazen
-Dazen:
-  regex: 'dazen'
-  device: 'smartphone'
-  models:
-    - regex: '6A'
-      model: '6A'
-
 # Denver Electronics (denver-electronics.com)
 Denver:
   regex: '(?:TAQ_10[4G]|TA[CDQ]-[0-9]+)|P(?:.+)TAQ-(?:[0-9]+)|SDQ[_-](?:550[24]4L|52001G|50002G|57004L)'
@@ -7761,33 +7760,33 @@ Digiland:
     - regex: '(Compumax Blue)' # Compumax
       model: '$1'
 
-# Digit4G or DIGIT (https://digit4g.com/)
-Digit4G:
+# Digit (https://digit4g.com/)
+Digit:
   regex: 'Digit_|Digit4G|Digit(?:4G|play1|next_Ultra)|DIGIT (?:INFINITY|Glory1)'
   device: 'smartphone'
   models:
     - regex: 'Digitplay1(?:[);/ ]|$)'
-      model: 'Play1'
+      model: 'Digit4G Play1'
     - regex: 'Digitnext_Ultra(?:[);/ ]|$)'
-      model: 'Next Ultra'
+      model: 'Digit4G Next Ultra'
     - regex: 'Glory1(?:[);/ ]|$)'
-      model: 'Glory1'
+      model: 'Digit4G Glory1'
     - regex: 'INFINITY MAX(?:[);/ ]|$)'
-      model: 'Infinity Max'
+      model: 'Digit4G Infinity Max'
     - regex: 'INFINITY(?:[);/ ]|$)'
-      model: 'Infinity'
+      model: 'Digit4G Infinity'
     - regex: 'Energy Max(?:[);/ ]|$)'
-      model: 'Energy Max'
+      model: 'Digit4G Energy Max'
     - regex: 'Digit_Digit4G[_-](Bold|Defender|Elite|Music|Power|Shine|Star)_4G(?:[);/ ]|$)'
-      model: '$1'
+      model: 'Digit4G $1'
     - regex: 'Digit_Digit4GLite_4G(?:[);/ ]|$)'
-      model: 'Lite'
+      model: 'Digit4G Lite'
     - regex: 'Digit_Digit4GPowerMAX_4G(?:[);/ ]|$)'
-      model: 'Power Max'
+      model: 'Digit4G Power Max'
     - regex: 'Digit4G[ _]E([234])[ _]pro(?:[);/ ]|$)'
-      model: 'E$1 Pro'
+      model: 'Digit4G E$1 Pro'
     - regex: 'Digit4G[ -](Energy|Pro)'
-      model: '$1'
+      model: 'Digit4G $1'
 
 # Compumax or COMPUMAX COMPUTER  S.A.S (www.compumax.com.co)
 COMPUMAX:
@@ -8536,12 +8535,6 @@ Elenberg:
     - regex: '(TAB(?:101|728)[ _]3G|TAB7(?:[03]8|16|40|3[30]))'
       model: '$1'
 
-# Ericy
-Ericy:
-  regex: 'Ericy-([a-z0-9]+)'
-  device: 'feature phone'
-  model: '$1'
-
 # Essential or Essential Products
 Essential:
   regex: 'PH-1(?:[);/ ]|$)'
@@ -9344,15 +9337,17 @@ Ergo:
       model: 'GHS55'
       device: 'tv'
 
-# Ericsson
+# Ericsson (also includes "Ericy", which was previously treated as separate brand, but was not able to find evidence of it existence aside from being short name for Ericsson)
 Ericsson:
-  regex: '(?:Ericsson(?:/ )?[a-z0-9]+)|(?:R380 2\.0 WAP1\.1)'
+  regex: '(?:Ericsson(?:/ )?[a-z0-9]+)|(?:R380 2\.0 WAP1\.1)|Ericy-([a-z0-9]+)'
   device: 'feature phone'
   models:
     - regex: 'Ericsson(?:/ )?([a-z0-9]+)'
       model: '$1'
     - regex: 'R380 2\.0 WAP1\.1'
       model: 'R380'
+    - regex: 'Ericy-([a-z0-9]+)'
+      model: '$1'
 
 # Energizer (www.energizeyourdevice.com)
 Energizer:
@@ -10581,14 +10576,6 @@ Gtel:
     - regex: 'Gtel[ _-]([^;/]+)(?: Build|[;)])'
       model: '$1'
 
-# H133
-H133:
-  regex: 'Betacrux(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: 'Betacrux(?:[);/ ]|$)'
-      model: 'Betacrux'
-
 # H96 (https://www.h96tvbox.com/)
 H96:
   regex: 'H96[ _]?(?:Max|mini H8|plus|PRO\+)'
@@ -11129,8 +11116,8 @@ Huagan:
     - regex: 'Huagan[ _]([^;/)]+)(?: Build|[);])'
       model: '$1'
 
-# Stream or Stream System
-Stream:
+# Stream or StreamSystem or Stream System (https://www.streamsystem.com)
+StreamSystem:
   regex: 'LGE; WSTR[0-9a-z]+;|(B3 (?:Maxi|Simply)|B3Pro|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:B1s|HT28|HT16))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -22917,8 +22904,9 @@ Rover:
   device: 'feature phone'
   model: '$1'
 
-# RoverPad or Rover Pad
-RoverPad:
+# Rover Computers (previously "Rover Pad" and "RoverPad", but "Pad" and "Phone" are more like model lines, and logo on them matches one at https://www.dailycomm.ru/m/5445/)
+# https://web.archive.org/web/20061029143520/http://www.rovercomputers.ru/
+Rover Computers:
   regex: '(?:Rover[ ]?Pad|RoverPhone|(?:Air|Art|Sky) 7\.85 3G|Pro_Q(?:8|10)_LTE)(?:[);/ ]|$)'
   device: 'tablet'
   models:
@@ -25050,7 +25038,7 @@ Skyworth:
 
 # Smartfren
 Smartfren:
-  regex: 'Smartfren|Androtab|Andromax|PD6D1J|AD682J|AD68[89]G|AD6B1H|AD9A1H|AD682H|AD683G'
+  regex: 'Smartfren|Androtab|Andromax|PD6D1J|AD682J|AD68[89]G|AD6B1H|AD9A1H|AD682H|AD683G|I46D1G|EG680|EG98'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -25079,6 +25067,12 @@ Smartfren:
       model: 'Andromax L'
     - regex: 'New Andromax-i'
       model: 'New Andromax I'
+    - regex: 'I46D1G'
+      model: 'Andromax R'
+    - regex: 'EG680'
+      model: 'Andromax Z'
+    - regex: 'EG98'
+      model: 'Andromax U2'
 
     - regex: 'Andromax[ _-]([^/;]+) Build'
       model: 'Andromax $1'
@@ -26545,13 +26539,13 @@ Sonim:
     - regex: '(?:Sonim-)?XP9900'
       model: 'XP10'
 
-# Star
-Star:
+# Kingelon (previously "Star", which seems to be as valid as "Tengda", since a bunch of devices were released both under Kingelon and Star or/and Tengda, for example https://www.needrom.com/download/star-n8800-miui-tengda-kingelon/, but only Kingelon seems to have a logo at least, which is at least some evidence of it being real)
+Kingelon:
   regex: '(?:N(?:9[5678]00|8800|9000|9977)|Star[ _]N9589)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'N9000'
-      model: 'Note 3'
+      model: 'N9000'
     - regex: '(?:Star_)?N(9[5678]00|8800|9977|9589)(?:[);/ ]|$)'
       model: 'N$1'
 
@@ -27535,13 +27529,14 @@ Tecno Mobile:
     - regex: 'Tecno[ _-]?([a-z0-9_-]+)'
       model: '$1'
 
-# TechSmart or Techmade
-TechSmart:
+# Techmade (often seen as TechSmart, which is actually a model line: https://www.ebay.it/itm/112931113112 https://www.ebay.it/itm/123071096677 https://www.facebook.com/661598300623815/photos/a.661606387289673/1242575672526072/?type=3&locale=hi_IN)
+# https://www.techmade.eu
+Techmade:
   regex: 'TECHSMART[_ ]'
   device: 'smartphone'
   models:
     - regex: 'TECHSMART[_ ]([^/;)]+)(?: Build|[);])'
-      model: '$1'
+      model: 'TechSmart $1'
 
 # TechPad (techpad.mx)
 TechPad:
@@ -28370,7 +28365,7 @@ Fenoti:
     - regex: '(?:FENOTI_)?(42FN6000F)(?:[);/ ]|$)'
       model: '$1'
 
-# VK Mobile
+# Viable Korea, now known as VK Mobile (https://en.namu.wiki/w/VK모바일, not related to either Russian "VK" (has "VK Mobile" division) or distributors like https://www.facebook.com/profile.php?id=100068485995715 and https://www.facebook.com/VKmobillethemines/
 VK Mobile:
   regex: 'VK-VK([79]00)(?:[);/ ]|$)'
   device: 'feature phone'
@@ -31227,12 +31222,6 @@ MLS:
     - regex: 'iQF ?200(?:[);/ ]|$)'
       model: 'iQF200'
 
-# MMI
-MMI:
-  regex: 'MMI, ([a-z0-9_ -]+), (?:wired|wireless)'
-  device: 'tv'
-  model: '$1'
-
 # FLYCAT
 FLYCAT:
   regex: 'FLYCAT'
@@ -33793,23 +33782,18 @@ Zfiner:
   device: 'tablet'
   model: 'Y900'
 
-# EKINOX (https://ekinoxnigeria.com/)
-EKINOX:
-  regex: '(?:E8_Ultra)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: 'E8_Ultra'
-      model: 'E8 Ultra'
-
-# iGet (www.iget.eu)
+# iGet (www.iget.eu, also covers EKINOX, which is a model line from this brand, previously treated as a separate brand)
 iGet:
-  regex: 'iGET SMART|(?:SMART[_ ](?:L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|L11|L3[12]|W[12]0X|W101|W3[12]|W8[4X]|W20[23]|L206)(?:_eea)?|Android 5(?:[\d.]*);(?: [\w-]+;)? (?:S100))(?:[);/ ]|$)'
+  regex: 'iGET SMART|E8_Ultra|(?:SMART[_ ](?:L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|L11|L3[12]|W[12]0X|W101|W3[12]|W8[4X]|W20[23]|L206)(?:_eea)?|Android 5(?:[\d.]*);(?: [\w-]+;)? (?:S100))(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: '(?:SMART[_ ])?S100(?:[);/ ]|$)'
       model: 'Smart S100'
     - regex: 'SMART[_ ](L20X|G10[12]|S7[02]|G71|G81[H]?|L10[234]|L11|W[12]0X|W101|W8[4X]|W3[12]|W20[23]|L206|L3[12])'
       model: 'Smart $1'
+    - regex: 'E8_Ultra'
+      device: 'smartphone'
+      model: 'EKINOX E8 Ultra'
 
 # Phicomm
 Phicomm:
@@ -34175,7 +34159,7 @@ TWM:
       model: 'Amazing $1'
 
 # TWZ or TWZ Corporation PLC (twz.co.th)
-TWZ:
+TWZ Corporation:
   regex: 'TWZ[-_ ](?:TabPlay|Y6[08]|Y52|A49|A[59]5|A567|AA8|QQ[12])|TWZQQ1|(?:OX_X1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -34551,9 +34535,15 @@ SEMP TCL:
 
 # Newman
 Newman:
-  regex: 'Newman[ _](P308|K1|G5i)(?:[);/ ]|$)'
+  regex: '(?:(?:(?:Newman[ _])(P308|K1|G5i))|(UE Pad 1))(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
+  models:
+    - regex: 'Newman[ _](P308|K1|G5i)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: 'UE Pad 1'
+      device: 'tablet'
+      model: 'UE 1 PAD'
 
 # Swipe
 Swipe:
@@ -34586,7 +34576,7 @@ Owwo:
       model: 'Carnival B5'
 
 # 360 or names Qihoo 360, +360, QiKU 360
-'360':
+360:
   regex: '(?:180[1379]-A01|1713-A01|1707-A01|1509-A00|1603-A03|1607-A01|1503-A01|1505-A0[12]|1605-A01)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -34910,11 +34900,11 @@ Bobarry:
   device: 'tablet'
   model: 'K10 SE'
 
-# Wortmann (wortmann.de)
-Wortmann:
+# Terra (sub-brand of wortmann.de used for consumer electronics, https://en.wikipedia.org/wiki/Wortmann)
+Terra:
   regex: 'TERRA[ _]PAD[ _](\d+)(_V2)?(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'Terra Pad $1$2'
+  model: 'Pad $1$2'
 
 # BB Mobile
 BB Mobile:
@@ -34947,15 +34937,19 @@ BB Mobile:
       device: 'smartphone'
       model: 'Techno Spark 3G X595BT'
 
-# 2E (2e.ua)
+# 2E or Twoe (2e.ua | https://gva.com.ua/mobilnye-telefony/2e-twoe/)
 2E:
-  regex: '(?:E500A_2019|2E E450 2018)(?:[);/ ]|$)'
+  regex: '(?:(?:E500A_2019|2E E450 2018)|(?:TWOE[-_ ]E450R|F534L|F572L|E500A))(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'E500A_2019(?:[);/ ]|$)'
       model: 'E500A (2019)'
     - regex: '2E E450 2018(?:[);/ ]|$)'
       model: 'E450 (2018)'
+    - regex: 'TWOE[-_ ](E450R)(?:[);/ ]|$)'
+      model: '$1'
+    - regex: '(F534L|F572L|E500A)(?:[);/ ]|$)'
+      model: '$1'
 
 # Billion
 Billion:
@@ -35128,16 +35122,6 @@ Jio:
     - regex: 'Jio/([^/]+)/'
       model: '$1'
 
-# Twoe
-Twoe:
-  regex: '(?:TWOE[-_ ]E450R|F534L|F572L|E500A)(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: 'TWOE[-_ ](E450R)(?:[);/ ]|$)'
-      model: '$1'
-    - regex: '(F534L|F572L|E500A)(?:[);/ ]|$)'
-      model: '$1'
-
 # iTruck
 iTruck:
   regex: 'iTRUCK 7 3G(?:[);/ ]|$)'
@@ -35239,7 +35223,7 @@ Logic:
       model: '$1'
 
 # Cloud or Cloud TruConnect or Cloud_Mobile (www.cloudmobileusa.com)
-Cloud:
+Cloud Mobile:
   regex: '(?:Cirrus_C2|Cyclone_C4|Storm_C3|Stratus_C[57](?:_Elite)?|Stratus C8|Sunshine_T1|Typhoon_C6|Sunshine_T1_Elite)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -35251,19 +35235,9 @@ Cloud:
       device: 'tablet'
       model: '$1'
 
-# Cloudpad
-Cloudpad:
-  regex: '\+VT(?:107C|Q007C)(?:[);/ ]|$)'
-  device: 'tablet'
-  models:
-    - regex: '\+VT(107C)'
-      model: '+VT$1'
-    - regex: '\+VTQ(007C)'
-      model: '+VTQ$1'
-
 # Cloudfone
 Cloudfone:
-  regex: 'CloudFone[ _]|(?:Thrill[ _](?:Boost[ ]?(2|3)?|Power|Snap|Access|Plus 16GB|Lite|HD)|Excite Prime 2 Pro|Excite Prime|ExciteC|NBA Edition|Go SP|Next Infinity Plus|Next Infinity|Next Lite|Go Connect)(?:[);/ ]|$)'
+  regex: '\+VT(?:107C|Q007C)|CloudFone[ _]|(?:Thrill[ _](?:Boost[ ]?(2|3)?|Power|Snap|Access|Plus 16GB|Lite|HD)|Excite Prime 2 Pro|Excite Prime|ExciteC|NBA Edition|Go SP|Next Infinity Plus|Next Infinity|Next Lite|Go Connect)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'Thrill Boost 2 Plus(?:[);/ ]|$)'
@@ -35300,6 +35274,12 @@ Cloudfone:
       model: 'Next Lite'
     - regex: 'Next(?:[);/ ]|$)'
       model: 'Next'
+    - regex: '\+VT107C'
+      device: 'tablet'
+      model: 'Cloudpad C701TV+'
+    - regex: '\+VTQ007C'
+      device: 'tablet'
+      model: 'Cloudpad C700QTV+'
 
 # Völfen (https://www.volfen.net/)
 Völfen:
@@ -35763,11 +35743,16 @@ MDC Store:
     - regex: 'MDC M5(?:[);/ ]|$)'
       model: 'M5'
 
-# MDTV
-MDTV:
-  regex: 'MDTV(?:[);/ ]|$)'
+# OTT (previously MDTV, but it looks to be a model line from OTT based on branding on the cardboard boxes, for example https://www.madridcenter.com/produto/tv-box-mdtv-pro-8k-32-256gb-android-11-1-5g-preto-749749.html)
+# Also cover "LPX-G" which was previously treated as a separate brand, but is also a model of OTT based on listings like https://prom.ua/p705060188-boks-ott-box.html
+OTT:
+  regex: 'MDTV|LPX-G BOX'
   device: 'tv'
-  model: ''
+  models:
+    - regex: 'MDTV'
+      model: 'MDTV'
+    - regex: 'LPX-G Box Max'
+      model: 'LPX-G Box Max'
 
 # meanIT (meanit.hr)
 meanIT:
@@ -35933,7 +35918,7 @@ Transpeed:
       model: '$1'
 
 # 8848 (everest 8848, 8848 titanium)
-'8848':
+8848:
   regex: '8848 (M[3-6])(?:[);/ ]|$)'
   device: 'smartphone'
   model: '$1'
@@ -35966,18 +35951,18 @@ Swisstone:
   device: 'smartphone'
   model: '$1'
 
-# P-UP (Peaup Co., Ltd.) (p-up.jp, mode1.jp)
-P-UP:
+# Mode 1 (Previously P-UP (Peaup Co., Ltd.), and while Mode 1 is legally owned by P-UP (https://www.p-up.world/brands/), Mode 1 is a separate thing (https://mode1.jp), and not a model line or brand like "Galaxy" for Samsung)
+Mode 1:
   regex: 'MD-0[143]P(?:[);/ ]|$)'
   device: 'phablet'
   models:
     - regex: 'MD-04P(?:[);/ ]|$)'
-      model: 'Mode 1 RR'
+      model: 'RR'
     - regex: 'MD-03P(?:[);/ ]|$)'
-      model: 'Mode 1 RS'
+      model: 'RS'
     - regex: 'MD-01P(?:[);/ ]|$)'
       device: 'smartphone'
-      model: 'Mode 1 MD-01P'
+      model: 'MD-01P'
 
 # Pacific Research Alliance (https://www.pacificresearchalliance.com/)
 Pacific Research Alliance:
@@ -36689,8 +36674,8 @@ VAIO:
     - regex: '(VA-10J)'
       model: '$1'
 
-# Spark (https://www.spark.co.nz/)
-Spark:
+# Spark (https://www.spark.co.nz/), NZ (New Zealand) used to avoid confusion with other hardware brands
+Spark NZ:
   regex: 'Spark Plus 3(?:[);/ ]|$)'
   device: 'smartphone'
   models:
@@ -37262,11 +37247,11 @@ Electroneum:
   device: 'smartphone'
   model: '$1'
 
-# High Q or HighQ
-High Q:
+# EPIK Learning (previously High Q or HighQ, but "HighQ" is a model line https://epiklearning.com/shop/)
+EPIK Learning:
   regex: '(ELT070[46]H|ELT0802H)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  model: 'HighQ $1'
 
 # Pluzz
 Pluzz:
@@ -37565,7 +37550,7 @@ Bellphone:
   device: 'smartphone'
   model: 'BP 100 X-Plus'
 
-# Gini
+# Gini (made by https://www.pelephone.co.il/)
 Gini:
   regex: 'Gini[ _]|(?:SW17W13|SW17W08)(?:[);/ ]|$)'
   device: 'smartphone'
@@ -37926,7 +37911,7 @@ Seatel:
     - regex: 'Seatel[ _](L2|V8[AE]|T[5-8]|R6|V[89])(?:[);/ ]|$)'
       model: '$1'
 
-# Ditecma (ditecma.com)
+# Ditecma (https://ditecma.com)
 Ditecma:
   regex: '(M1092R(?:-[12]|V[45])?)(?:[);/ ]|$)'
   device: 'tablet'
@@ -39398,11 +39383,11 @@ Kiowa:
     - regex: 'S5 ULTRA'
       model: 'S5 Ultra'
 
-# Sprint
-Sprint:
+# Quanta Computer ("Sprint" in previous versions, but "Sprint" seems to be a distributor brand (possibly https://en.wikipedia.org/wiki/Sprint_Corporation but no clear evidence was found at the time of writing), similar some HTC models https://phonedb.net/index.php?m=device&s=query&d=detailed_specs&brand=Sprint#result)
+Quanta Computer:
   regex: 'AQT(100|8[02])(?:[);/ ]|$)'
   device: 'tablet'
-  model: 'AQT$1'
+  model: 'Slate AQT$1'
 
 # Bundy Mobile (bundy-mobile.fr)
 Bundy:
@@ -39700,7 +39685,7 @@ Glory Star:
   device: 'tablet'
   model: ''
 
-# Polar (polar.ru)
+# Polar (https://polartv.ru/)
 Polar:
   regex: 'Polar(?:_W?K?)?[_ ]P\d{2}|(?:P42L31T2CSM|P32L33T2CSM)(?:[);/ ]|$)'
   device: 'tv'
@@ -39714,6 +39699,12 @@ PolarLine:
   device: 'tv'
   model: '$1'
 
+# MEGAMAX (sub brand Polar)
+MEGAMAX:
+  regex: 'MEGAMAX(?:_W_)?(\d{2}MG11FSM)'
+  device: 'tv'
+  model: '$1'
+
 # MyGica (www.mygica.com)
 MyGica:
   regex: 'MyGica[_ ]'
@@ -41032,11 +41023,12 @@ Facetel:
     - regex: 'Q3pro(?:[);/ ]|$)'
       model: 'Q3 Pro'
 
-# HLLO or Exertis HLLO
-HLLO:
+# Exertis (previously HLLO, but was not able to find any evidence of this being a brand besides it being part of Exertis accelerator. Search for the model also shows Exertis most of the times, so HLLO is probably a model line rather than a (sub-)brand)
+# https://www.exertis.co.uk/
+Exertis:
   regex: '(SMB-H8009)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  model: 'HLLO $1'
 
 # YUMKEM
 YUMKEM:
@@ -41171,11 +41163,11 @@ Denali:
   device: 'tablet'
   model: 'E-Tab $1'
 
-# DreamTab
-DreamTab:
+# Powerway (previously Dreamtab, but it looks like a model line of Powerway as per some images, for example https://zebramo.com/products/powerway-tablet-tablet-tablet-tablet-tablet-351954019 and https://www.needrom.com/download/powerway-dreamtab-drn-x300/)
+Powerway:
   regex: '(DRN-[78]09)(?:[);/ ]|$)'
   device: 'tablet'
-  model: '$1'
+  model: 'Dreamtab $1'
 
 # DL
 DL:
@@ -41531,8 +41523,8 @@ JREN:
   device: 'tablet'
   model: '$1'
 
-# Wanmukang (www.wanmuk.com)
-Wanmukang:
+# Zhongyu Display (previously Wanmukang (www.wanmuk.com), but ZC-339 is a motherboard from Zhongyu Display https://www-zyuxs-cn.translate.goog/news-8/650.html?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US&_x_tr_pto=wapp | https://www.zyuxs.com)
+Zhongyu Display:
   regex: '(?:ZC-339)(?:[);/ ]|$)'
   device: 'tablet'
   models:
@@ -41608,7 +41600,7 @@ Topsion:
 
 # Ceibal (www.ceibal.edu.uy)
 Ceibal:
-  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|GACRUX|Kil-82WFDC|U800B)(?:[);/ ]|$)'
+  regex: '(?:ACRUX|BELLATRIX|BETELGEUSE|GACRUX|Betacrux|Kil-82WFDC|U800B)(?:[);/ ]|$)'
   device: 'tablet'
   models:
     - regex: 'ACRUX'
@@ -41623,6 +41615,9 @@ Ceibal:
       model: 'Kiland T8'
     - regex: '(U800B)'
       model: '$1'
+    - regex: 'Betacrux(?:[);/ ]|$)'
+      device: 'smartphone'
+      model: 'H133 Beta Crux'
 
 # Wecool
 Wecool:
@@ -42327,12 +42322,6 @@ OSCAL:
       device: 'tablet'
       model: 'Spider 8'
 
-# UE or United Education (www.ue.cn)
-UE:
-  regex: 'UE Pad 1'
-  device: 'tablet'
-  model: 'Pad 1'
-
 # Hykker (www.hykker.com)
 Hykker:
   regex: 'Hykker_MyTab10'
@@ -42355,14 +42344,6 @@ Quatro:
   device: 'smartphone'
   model: '$1'
 
-# White Mobile
-White Mobile:
-  regex: 'AM1010V(?:[);/ ]|$)'
-  device: 'smartphone'
-  models:
-    - regex: 'AM1010V'
-      model: 'Omega Lite 3'
-
 # ALLINmobile Or Allin Mobile
 ALLINmobile:
   regex: 'ALLINmobile_ARENA(?:[);/ ]|$)'
@@ -42597,14 +42578,6 @@ Waltter:
   device: 'tablet'
   model: 'Neo 10.1"'
 
-# LPX-G
-LPX-G:
-  regex: 'LPX-G BOX'
-  device: 'tv'
-  models:
-    - regex: 'LPX-G Box Max'
-      model: 'Box Max'
-
 # VALTECH
 VALTECH:
   regex: 'TAB7Q804VAL'
@@ -43048,11 +43021,11 @@ Webfleet:
   device: 'car browser'
   model: 'Pro 8475'
 
-# ROiK
-ROiK:
+# KAP (previously ROiK, but that's a model according to this https://www.youtube.com/watch?v=g9TNZJFTTsE)
+KAP:
   regex: 'ROiK ?(10)(?:[);/ ]|$)'
   device: 'car browser'
-  model: '$1'
+  model: 'ROiK-10'
 
 # Kinstone
 Kinstone:
@@ -43281,8 +43254,8 @@ AEEZO:
   device: 'tablet'
   model: '$1'
 
-# TPS or SZ TPS
-TPS:
+# TPS or SZ TPS (https://www.tpswkn.com/tr/products-detail-478747)
+SZ TPS:
   regex: 'TPS-(SC10)(?:[);/ ]|$)'
   device: 'tablet'
   model: '$1'
@@ -43394,8 +43367,8 @@ UOOGOU:
     - regex: 'UOOGOU[_ ]([^/;)]+)(?: Build|[);])'
       model: '$1'
 
-# MLAB or MicroLab
-MLAB:
+# MLAB or MicroLab (https://mlab.cl/about-us/)
+Microlab:
   regex: 'MLAB[ _-]'
   device: 'tablet'
   models:
@@ -43672,11 +43645,11 @@ A&K:
   device: 'feature phone'
   model: '$1'
 
-# BASE
-BASE:
+# Unikalne Smartphones (https://www.gsmchoice.com/en/catalogue/unikalne/)
+Unikalne Smartphones:
   regex: 'BASE[_ ](Varia)'
   device: 'smartphone'
-  model: '$1'
+  model: 'BASE $1'
 
 # BAUHN (https://bauhn.com.au/)
 BAUHN:
@@ -43806,7 +43779,7 @@ Dyon:
 
 # Hisense (https://www.hisense-usa.com/)
 Hisense:
-  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9-]*|HNR(?:320T|55[01]T)|E270BSA|HWCD100E|HITV300C|HITV205N|M470BS[AE]|EG98|E2281|EG680|I46D1G|HAT4KDTV|HITV10[12]C|HLTE(?:[237]00T|229T|200M|203T|202N|21[023567][TM]|22[67]T|22[13]E|230E|239E|103E|310[TM]|31[16]T|500T|501N|510[TM]|556N|7[23]0T|720E|M800)|KS(?:907|964)|U972|U601S Pro|U972_Pro|HiSmart [24]K ATV4|HiSmartTV A4'
+  regex: '(?:HS-)?Hisense ([^;/]+) Build|Hisense|HS-(?:G|U|EG?|I|L|T|X)[0-9]+[a-z0-9-]*|HNR(?:320T|55[01]T)|E270BSA|HWCD100E|HITV300C|HITV205N|M470BS[AE]|E2281|HAT4KDTV|HITV10[12]C|HLTE(?:[237]00T|229T|200M|203T|202N|21[023567][TM]|22[67]T|22[13]E|230E|239E|103E|310[TM]|31[16]T|500T|501N|510[TM]|556N|7[23]0T|720E|M800)|KS(?:907|964)|U972|U601S Pro|U972_Pro|HiSmart [24]K ATV4|HiSmartTV A4'
   device: 'smartphone'
   models:
     # explicit tablet models
@@ -43850,12 +43823,6 @@ Hisense:
       model: 'H30'
     - regex: 'HLTE720E'
       model: 'U30'
-    - regex: 'I46D1G'
-      model: 'Smartfren Andromax R'
-    - regex: 'EG680'
-      model: 'Smartfren Andromax Z'
-    - regex: 'EG98'
-      model: 'Smartfren Andromax U2'
     - regex: 'HLTE200T(?:[);/ ]|$)'
       model: 'F26'
     - regex: 'HLTE210T(?:[);/ ]|$)'
@@ -44322,8 +44289,8 @@ Clovertek:
   device: 'tablet'
   model: '$1'
 
-# Padpro
-Padpro:
+# 7Ke tree (previously "Padpro", but "Padpro" seem like a model line, for example at least https://www.ebay.com/itm/404866696988 and https://www.ubuy.com.se/en/product/G68Y4S8AO-new-listing-14-inch-big-screen-tablet-pc-android-13-16gb-ram-512gb-rom-deca-core-keyboard?ref=hm-google-redirect seem like the same device)
+7Ke tree:
   regex: 'GT40promax'
   device: 'tablet'
   model: 'GT40 Pro Max'
@@ -44909,12 +44876,6 @@ PLDT:
       device: 'peripheral'
       model: 'TelPad MT7'
 
-# MEGAMAX
-MEGAMAX:
-  regex: 'MEGAMAX(?:_W_)?(\d{2}MG11FSM)'
-  device: 'tv'
-  model: '$1'
-
 # PrismPlus (prismplus.sg)
 PRISM+:
   regex: 'PrismPlus'
diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml
index 6d7d48565e..0a62d309f6 100644
--- a/regexes/device/televisions.yml
+++ b/regexes/device/televisions.yml
@@ -258,8 +258,8 @@ DIORA:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'
 
-# DMM
-DMM:
+# Dream Multimedia (https://www.dmm-tv.com)
+Dream Multimedia:
   regex: 'DMM'
   device: 'tv'
   model: 'Dreambox'
@@ -508,8 +508,8 @@ HOTACK:
   device: 'peripheral'
   model: ''
 
-# Hotel
-Hotel:
+# Hotel TV Company (https://www.hoteltvcompany.co.uk/about/)
+Hotel TV Company:
   regex: 'HOTEL[;,)]'
   device: 'tv'
   model: ''
@@ -1554,8 +1554,8 @@ VORTEX (RO):
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'
 
-# VOX (https://www.voxelectronics.com/)
-VOX:
+# VOX Electronics (https://www.voxelectronics.com/)
+VOX Electronics:
   regex: 'VOX[;,)]'
   device: 'tv'
   models: