Products cleanup: W-Z

- split product name into manufacturer, model, model_id, name as appropriate.
- move any branding out of top level name.

This commit is the final commit for configs starting with the letters
`w`, `x`, `y` and `z`.

custom_components/tuya_local/devices/wadapower_q8_evcharger.yaml

@@ -1,7 +1,9 @@
 name: EV charger
 products:
   - id: bktb3jskdic1ar2t
-    name: Wada Power Q8 32A Wall Charger
+    manufacturer: Wada Power
+    model: Q8 32A
+    name: Wall charger
 entities:
   - entity: sensor
     translation_key: status

custom_components/tuya_local/devices/warme_gsh_heater.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: 8UGflCDtNYJw1dZs
-    name: Warme GSH heater
+    manufacturer: Warme
+    model: GSH
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/wdyk_2p63a_energy_meter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: r9kg2g1uhhyicycb
-    name: WDYK 2P63A
+    manufacturer: WDYK
+    model: 2P63A
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/wdyk_4p100a_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 # products:
 #   - id: UNKNOWN
-#     name: WDYK 4P100A
+#     manufacturer: WDYK
+#     model: 4P100A
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/weaja_s9_gasalarm.yaml

@@ -1,7 +1,8 @@
 name: Gas alarm
 # products:
 #   - id: UNKNOWN
-#     name: Weaja WJ-TUYA-S9
+#     manufacturer: Weaja
+#     model: WJ-TUYA-S9
 entities:
   - entity: binary_sensor
     class: gas

custom_components/tuya_local/devices/weau_pool_heatpump_v2.yaml

@@ -1,7 +1,7 @@
 name: Pool heat pump
 products:
   - id: zqwet1zcvj2wcxzw
-    name: W'Eau
+    manufacturer: "W'Eau"
 entities:
   - entity: climate
     translation_only_key: pool_heatpump

custom_components/tuya_local/devices/weeket_kettle.yaml

@@ -1,7 +1,8 @@
 name: Kettle
 products:
   - id: 01rtpfyd3amxdsps
-    name: Weekett KE4071TF
+    manufacturer: Weekett
+    model: KE4071TF
 entities:
   - entity: water_heater
     icon: "mdi:kettle"

custom_components/tuya_local/devices/welltobe_cat_feeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: qqzpxhisd6zs8zyq
-    name: WellToBe WB S36D
+    manufacturer: WellToBe
+    model: WB S36D
 entities:
   - entity: number
     icon: "mdi:paw"

custom_components/tuya_local/devices/wenzhi_wz35_presencesensor.yaml

@@ -1,7 +1,9 @@
 name: Presence sensor
 products:
   - id: 19m3dfjwe46njety
-    name: Wenzhi WZ35 MTG236-WF-RL 24GHz
+    manufacturer: Wenzhi
+    model: WZ35 24GHz
+    model_id: MTG236-WF-RL
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/wf39m_dimmer_smartplug.yaml

@@ -1,7 +1,8 @@
 name: Dimmer smartplug
 products:
   - id: zbisbtukzuiifmp6
-    name: Newone WF39M
+    manufacturer: Newone
+    model: WF39M
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/wfws02rj_dual_switch.yaml

@@ -1,7 +1,7 @@
 name: Dual switch
 products:
   - id: LOeuvI6KCxzuZe0k
-    name: WF-WS02 RJ
+    model: WF-WS02 RJ
 entities:
   - entity: switch
     name: Master

custom_components/tuya_local/devices/whm04_doorbell.yaml

@@ -1,7 +1,7 @@
 name: Doorbell
 products:
   - id: 26xtgamy3tv1awhl
-    name: WGH-ML-001
+    model: WGH-ML-001
 entities:
   - entity: siren
     icon: "mdi:bell"

custom_components/tuya_local/devices/wilfa_haze_hu400bc_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: 7naqdm8whbezn28v
-    name: Wilfa Haze
+    manufacturer: Wilfa
+    model: Haze
 entities:
   - entity: humidifier
     class: humidifier

custom_components/tuya_local/devices/windmill_airconditioner.yaml

@@ -1,7 +1,7 @@
 name: Air Conditioner
 products:
   - id: u8iolvwcrnginqzr
-    name: Windmill Air Conditioner
+    manufacturer: Windmill
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/wistar_roller_blind.yaml

@@ -1,7 +1,7 @@
 name: Roller blinds
 products:
   - id: c4hBLohzUgxULw5a
-    name: Wistar
+    manufacturer: Wistar
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/wistar_roller_blind_nopos.yaml

@@ -1,7 +1,7 @@
 name: Roller blinds
 products:
   - id: c4hBLohzUgxULw5a
-    name: Wistar
+    manufacturer: Wistar
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/wlrtcz05z_presencesensor.yaml

@@ -1,7 +1,7 @@
 name: Human presence
 # products:
 #   - id: UNKNOWN
-#     name: WL-RTCZ-05Z
+#     model: WL-RTCZ-05Z
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/wolfguard_wt2r_alarm.yaml

@@ -1,7 +1,8 @@
 name: Alarm system
 products:
   - id: dscqpiq1gdfltjt3
-    name: Wolf Guard WT2R
+    manufacturer: Wolf Guard
+    model: WT2R
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/wood_wdd90_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: kiiuovcdvvgxnj0n
-    name: Woods WDD90
+    manufacturer: Woods
+    model: WDD90
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/woods_cortina_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air Conditioner
 products:
   - id: bfc0e42617f4fdfef7t6ra
-    name: Wood's Cortina Silent 12k
+    manufacturer: Woods
+    model: Cortina Silent 12k
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/woods_milan_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: i5rv3ykmtfcagw1t
-    name: Wood's Milan 7K
+    manufacturer: Woods
+    model: Milan 7K
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/wouej_evcharger.yaml

@@ -1,7 +1,8 @@
 name: EV charger
 # products:
 #   - id: UNKNOWN
-#     name: WOUEJ 22kW wallbox
+#     manufacturer: WOUEJ
+#     model: 22kW wallbox
 entities:
   - entity: sensor
     name: State

custom_components/tuya_local/devices/xcase_nx4964_lockbox.yaml

@@ -1,7 +1,8 @@
 name: Lockbox
 products:
   - id: qicggi0m
-    name: XCase NX-4964 BLE
+    manufacturer: XCase
+    model: NX-4964 BLE
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/xiumii_smart_human_presence_sensor.yaml

@@ -1,8 +1,7 @@
 name: Presence sensor
 products:
   - id: 4ops1avp7zdwhyqu
-    name: Xiumii Smart Human Presence Sensor
-
+    manufacturer: Xiumii
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/xoca_dac2121c_energy_meter.yaml

@@ -1,7 +1,8 @@
 name: Multi-tariff energy meter
 products:
   - id: opdhepy0p7eyeurz
-    name: DAC-2121C BI
+    manufacturer: Xoca
+    model: DAC-2121C BI
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/yagusmart_3pn_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: fygozcnralhwbauo
-    name: Yagusmart/Zemismart 3PN 63A
+    manufacturer: Yagusmart/Zemismart
+    model: 3PN 63A
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/yidi_fan_light_switch.yaml

@@ -1,7 +1,8 @@
 name: Wall switch
 products:
   - id: 66urzkokqdufersv
-    name: NHZS Fan and light switch
+    manufacturer: NHZS
+    name: Fan and light switch
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/yieryi_ph_meter.yaml

@@ -1,7 +1,8 @@
 name: pH meter
 products:
   - id: 5ok0wq7drlqyo2hb
-    name: Yieryi YY-9909
+    manufacturer: Yieryi
+    model: YY-9909
 entities:
   - entity: sensor
     name: pH

custom_components/tuya_local/devices/yinmik_waterquality_tester.yaml

@@ -1,7 +1,8 @@
 name: Water quality monitor
 products:
   - id: u5xgcpcngk3pfxb4
-    name: Yinmik WF-3188
+    manufacturer: Yinmik
+    model: WF-3188
 entities:
   - entity: sensor
     icon: "mdi:pool-thermometer"

custom_components/tuya_local/devices/yp_petfeeeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: wfnmgiqqch80sg1w
-    name: YP PAF-40PCS-WBR3
+    manufacturer: YP
+    model: PAF-40PCS-WBR3
 entities:
   - entity: number
     icon: "mdi:paw"

custom_components/tuya_local/devices/yx025wb_aromadiffuser.yaml

@@ -1,7 +1,8 @@
 name: Aroma diffuser
 products:
   - id: yishet3p12fvohmd
-    name: Liplasting YX-025WB
+    manufacturer: Liplasting
+    model: YX-025WB
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/yx316wifi_aroma_diffuser.yaml

@@ -3,7 +3,7 @@
 name: Aroma diffuser with lamp
 products:
   - id: arkdxfhlkpdyof9x
-    name: YX316WIFI
+    model: YX316WIFI
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/yym_805SW_aroma_nightlight.yaml

@@ -3,11 +3,11 @@
 name: Aroma diffuser
 products:
   - id: c0nh3LmEk0NDebrq
-    name: YYM-805SW
+    model: YYM-805SW
   - id: 4870500398f4abbfbae4
-    name: GX
+    model: GX
   - id: kgczidn0awas0prr
-    name: Tellur
+    manufacturer: Tellur
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/zemismart_am25_rollerblind.yaml

@@ -1,7 +1,8 @@
 name: Roller blind
 products:
   - id: 7qcsglvoqkrdduk6
-    name: AM25WIFI
+    manufacturer: Zemismart
+    model: AM25WIFI
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/zemismart_dpwbs01_sprinklercontroller.yaml

@@ -1,7 +1,8 @@
 name: Sprinkler controller
 products:
   - id: e1epsoiywcirul2u
-    name: Zemismart DP-WBS01
+    manufacturer: Zemismart
+    model: DP-WBS01
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/zemismart_roller_shade.yaml

@@ -1,7 +1,8 @@
 name: Roller shade
 products:
   - id: jzmy5ut0vishwscm
-    name: Zemismart ZM25TQ
+    manufacturer: Zemismart
+    model: ZM25TQ
 entities:
   - entity: cover
     class: shade

custom_components/tuya_local/devices/zemismart_roller_shade_zm25r2.yaml

@@ -1,7 +1,8 @@
 name: Roller shade
 products:
   - id: 8nuvcigdwbth6dj7
-    name: Zemismart ZM25R2
+    manufacturer: Zemismart
+    model: ZM25R2
 entities:
   - entity: cover
     class: shade

custom_components/tuya_local/devices/zemismart_sdm01_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: fzxonzodwjiugioz
-    name: Zemismart SDM01-TW0/TZ0-12
+    manufacturer: Zemismart
+    model: SDM01-TW0/TZ0-12
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/zemismart_spm01_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: qhlxve78
-    name: Zemismart SPM01 Zigbee
+    manufacturer: Zemismart
+    model: SPM01 Zigbee
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/zg205w_mmWave_presence_sensor.yaml

@@ -1,10 +1,9 @@
 name: mmWave presence sensor
 products:
   - id: qbapy7r4deyp6zbx
-    name: ZG-205W
+    model: ZG-205W
   - id: uykwakpl6rbxvjdd
-    name: ZG-205W/A
-
+    model: ZG-205W/A
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/zigbee_climate_alarm.yaml

@@ -1,7 +1,6 @@
 name: Climate alarm
 products:
   - id: qaaysllp
-    name: Zigbee temperature humidity alarm sensor
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/zigbee_dv7vcs_human_presence_sensor.yaml

@@ -1,7 +1,8 @@
 name: Human presence sensor
 products:
   - id: sxm7l9xa
-    name: Loginovo mmWave human presence sensor
+    manufacturer: Loginovo
+    name: mmWave human presence sensor
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/zigbee_mir_te100ty_climate_sensor.yaml

@@ -1,7 +1,8 @@
 name: Climate sensor
 products:
   - id: a476raq2
-    name: MultiIR Zigbee TE100-TY
+    manufacturer: MultiIR
+    model: Zigbee TE100-TY
 entities:
   - entity: sensor
     class: humidity

custom_components/tuya_local/devices/zigbee_smart_bulb.yaml

@@ -2,13 +2,16 @@ name: Zigbee light
 legacy_type: peteme_smart_recessed_lighting
 products:
   - id: mja6r5ix
-    name: MOES zigbee lightbulb
+    manufacturer: Moes
   - id: it1u8ahz
-    name: MOES zigbee RGBCW
+    manufacturer: Moes
   - id: rcggc0ys
-    name: MOES ZC-TD SW zigbee GU10
+    manufacturer: Moes
+    model: ZC-TD SW zigbee GU10
   - id: sjaun9de
-    name: Peteme SIG_DL_RGBCW recessed lighting
+    manufacturer: Peteme
+    model: SIG_DL_RGBCW
+    name: Recessed lighting
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/zigbee_ultrasonic_watermeter.yaml

@@ -1,7 +1,8 @@
 name: Water meter
 products:
   - id: vuwtqx0t
-    name: ZPMeter 214C-Z
+    manufacturer: ZPMeter
+    model: "214C-Z"
 entities:
   - entity: sensor
     class: water

custom_components/tuya_local/devices/zigbee_waterleak_sensor.yaml

@@ -1,7 +1,7 @@
 name: Water leak sensor
 products:
   - id: upgcbody
-    name: Zigbee WL-898WZ
+    model: WL-898WZ
 entities:
   - entity: binary_sensor
     class: moisture

custom_components/tuya_local/devices/zigbee_zb10wt_temphumid_sensor.yaml

@@ -1,7 +1,8 @@
 name: Climate sensor
 products:
   - id: fie1dpkm
-    name: Nedis ZBSC10WT
+    manufacturer: Nedis
+    model: ZBSC10WT
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/zigbee_zn373186_temphumid_sensor.yaml

@@ -1,7 +1,8 @@
 name: Climate sensor
 products:
   - id: xr3htd96
-    name: Aubess temperature humidity sensor (zn373186_01)
+    manufacturer: Aubess
+    model: ZN373186_01
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/zigbee_zth08ztu_temphumid_sensor.yaml

@@ -1,7 +1,7 @@
 name: Temperature humidity sensor
 products:
   - id: cirvgep4
-    name: ZTH08ZTU
+    model: ZTH08ZTU
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/zm_wifi_smartmeter.yaml

@@ -1,7 +1,7 @@
 name: Energy meter
 products:
   - id: nzexeqam9qulajbf
-    name: ZM-wi-Fi
+    model: ZM-wi-Fi
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/zpmeter_ultrasonic_watermeter.yaml

@@ -1,7 +1,8 @@
 name: Water meter
 products:
   - id: zlwr0raf
-    name: ZPMeter 214C
+    manufacturer: ZPMeter
+    model: "214C"
 entities:
   - entity: sensor
     class: water

custom_components/tuya_local/devices/zx_db11_doorbell_alarm.yaml

@@ -1,7 +1,7 @@
 name: Doorbell
 products:
   - id: oqn2dj8otuhqhulr
-    name: ZX-DB11
+    model: ZX-DB11
 entities:
   - entity: binary_sensor
     name: Alarm

custom_components/tuya_local/devices/zx_db11b_doorbell_alarm.yaml

@@ -1,6 +1,7 @@
 name: Doorbell
 products:
   - id: 4kfqpaat5buefsv0
+    model: ZX-DB11B
     name: Alarm Hub with Melodies Pro
 entities:
   - entity: binary_sensor

custom_components/tuya_local/devices/zx_g30_alarm.yaml

@@ -1,7 +1,8 @@
 name: Alarm system
 products:
   - id: mw27s3tus4bb7nz3
-    name: ZX-G30 Dual-network security system
+    model: ZX-G30
+    name: Dual-network security system
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/zx_gs21_gasmonitor.yaml

@@ -1,7 +1,7 @@
 name: Gas leak detector
 products:
   - id: ozcdjaqrxauonq1f
-    name: ZX-GS21
+    model: ZX-GS21
 entities:
   - entity: sensor
     name: Gas leak

custom_components/tuya_local/devices/zyhps01_human_presence_sensor.yaml

@@ -1,8 +1,7 @@
 name: Human presence sensor
 products:
   - id: wzp9yjsobanavsut
-    name: ZY-HPS01-5.8G
-
+    model: ZY-HPS01-5.8G
 entities:
   - entity: binary_sensor
     class: motion

custom_components/tuya_local/devices/zym100_presence_sensor.yaml

@@ -1,9 +1,9 @@
 name: mmWave presence sensor
 products:
   - id: k2h8vkj98fhvnpiv
-    name: ZY-M100-WIFI
+    model: ZY-M100-WIFI
   - id: yroelksjtb4ehda8
-    name: WZ-M100-W
+    model: WZ-M100-W
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/zym100w_presence_sensor.yaml

@@ -1,7 +1,7 @@
 name: mmWave presence sensor
 products:
   - id: 4cjzlliucdjaanvl
-    name: ZY-M100-WIFI24G
+    model: ZY-M100-WIFI24G
 entities:
   - entity: binary_sensor
     class: motion

custom_components/tuya_local/devices/zym201_presence_sensor.yaml

@@ -1,7 +1,7 @@
 name: mmWave presence sensor
 products:
   - id: n3bow00a2vpwgtvx
-    name: ZY-M201-WIFI24G
+    model: ZY-M201-WIFI24G
 entities:
   - entity: binary_sensor
     class: occupancy