Products cleanup: Q-S

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

This commit is for configs starting with the letters `q`, `r` and `s`.

custom_components/tuya_local/devices/qh_gd_elegant_heater.yaml

@@ -1,7 +1,7 @@
 name: IR panel heater
 products:
   - id: 4iuq3mlns7b2zi7q
-    name: QH-GD Elegant Series
+    model: QH-GD Elegant Series
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/qlima_d812_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: pxlnsbmh6jdqh35n
-    name: Qlima D812
+    manufacturer: Qlima
+    model: D812
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/qlima_d820a_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: bfba28a17b4fe4e87aljv2
-    name: Qlima D820A
+    manufacturer: Qlima
+    model: D820A
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/qnect_usb_powerstrip.yaml

@@ -1,7 +1,8 @@
 name: 3 outlet + USB powerstrip
 products:
   - id: ivd9p236skiaqdrk
-    name: Qnect QN-WP03
+    manufacturer: Qnect
+    model: QN-WP03
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/qoto_05_water_valve.yaml

@@ -1,7 +1,8 @@
 name: Water valve
 products:
   - id: arge1ptm
-    name: QOTO 05 water valve
+    manufacturer: QOTO
+    model: "05"
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/qs_c01_curtain.yaml

@@ -1,9 +1,9 @@
 name: Curtain module
 products:
   - id: ujrix5o9vgovrctb
-    name: QS-WIFI-C01
+    model: QS-WIFI-C01
   - id: ol1uhvza
-    name: QS-ZIGBEE-C01
+    model: QS-ZIGBEE-C01
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/quad_power_timer.yaml

@@ -1,7 +1,8 @@
 name: Quad powerstrip
 products:
   - id: ckg60n4x6qakegxo
-    name: Pearl Xystec NX-4986-919 4xUSB
+    manufacturer: Xystec
+    model: NX-4986-919 4xUSB
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/quad_powerstrip.yaml

@@ -1,7 +1,8 @@
 name: Quad powerstrip
 products:
   - id: l5gnaxuawkjfquqo
-    name: Kogan KASPS10A3P3UA 3+USB
+    manufacturer: Kogan
+    model: KASPS10A3P3UA 3+USB
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/rainpoint_water_timer.yaml

@@ -1,7 +1,8 @@
 name: Water timer
 products:
   - id: ew946yrp3pgbaziu
-    name: RainPoint TTV103FRF
+    manufacturer: RainPoint
+    model: TTV103FRF
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/raykube_a1promax_lock.yaml

@@ -1,7 +1,8 @@
 name: Door lock
 products:
   - id: rlyxv7pe
-    name: Raykube A1 Pro Max
+    manufacturer: Raykube
+    model: A1 Pro Max
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/reiga_ceiling_fan.yaml

@@ -1,7 +1,7 @@
 name: Ceiling Fan
 products:
   - id: aktxh7558udrex8a
-    name: Reiga Smart Ceiling Fan
+    manufacturer: Reiga
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/relay_switch_remote.yaml

@@ -1,9 +1,9 @@
 name: Relay switch
 products:
   - id: 1aegphq4yfd50e6b
-    name: 1-433
+    model: "1-433"
   - id: fugkn1vkc53nvo1s
-    name: 1 Gang WiFi Smart Relay
+    model: "1 Gang WiFi Smart Relay"
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/renpho_rp_ap001s.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: oaleouzsq0sk4quk
-    name: Renpho RP-AP001S
+    manufacturer: Renpho
+    model: RP-AP001S
 entities:
   - entity: fan
     icon: "mdi:air-purifier"

custom_components/tuya_local/devices/rgb_led_strip.yaml

@@ -2,13 +2,18 @@ name: LED strip
 legacy_type: nince_rgb_led_strip
 products:
   - id: dga9j4k3myutu1qo
-    name: Teberno LGC-005 OEM3
+    manufacturer: Teberno
+    model: LGC-005 OEM3
   - id: q5dhxp3mjrbmr5pi
-    name: Novostella Chastar Rainbow permanent outdoor light
+    manufacturer: Novostella
+    model: Chastar Rainbow
+    name: Permanent outdoor light
   - id: httjaqed1h4iteup
-    name: Panamalar Sunset lamp
+    manufacturer: Panamalar
+    model: Sunset
+    name: Sunset lamp
   - id: whomcoylqdl8r4jw
-    name: Nince RGB LED strip
+    manufacturer: Nince
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rgbcw_lightbulb.yaml

@@ -1,19 +1,24 @@
 name: RGBCW Lightbulb
 products:
   - id: aok3caeleulg1neh
-    name: Lijun smart bulb RGBCW
+    manufacturer: Lijun
   - id: keytg5kq8gvkv9dh
-    name: Lijun smart bulb RGBCW
+    manufacturer: Lijun
   - id: nh2i3k5q5aenhdq3
-    name: Aubess E14 smart bulb RGBCW
+    manufacturer: Aubess
+    model: E14 RGBCW
   - id: ei0cjv7ogxdgcekq
-    name: BrilliantSmart RGB garden lights
+    manufacturer: Brilliant Smart
+    name: RGB garden lights
   - id: ivxfweclfhvra3ym
-    name: Lampux bedside lamp
+    manufacturer: Lampux
+    name: Bedside lamp
   - id: wufw0loegkb1y3u3
-    name: Genio Smart WIFI bulb A60 RGB+CCT
+    manufacturer: Mirabella Genio
+    model: A60 RGB+CCT
   - id: gshkqhi4fx9qqwrr
-    name: ANWIO BR30 WiFi Smart LED Bulb RGB+CCT 13W
+    manufacturer: ANWIO
+    model: BR30 RGB+CCT 13W
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rgbcw_lightbulb_xld_cl002.yaml

@@ -1,7 +1,8 @@
 name: RGBCW Lightbulb
 products:
   - id: bfde31c920bcaa323azft2
-    name: Xinled XLD-CL002
+    manufacturer: Xinled
+    model: XLD-CL002
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rgbcw_lightbulbv2.yaml

@@ -1,7 +1,7 @@
 name: RGBCW lightbulb
 products:
   - id: bqkefojbmb8ovvws
-    name: A60 RGBW smart bulb
+    model: A60 RGBW
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rgbw_lightbulb.yaml

@@ -1,9 +1,11 @@
 name: RGBW lightbulb
 products:
   - id: cqekgipywslyavsr
-    name: Merkury BW904 Smart Bulb
+    manufacturer: Merkury
+    model: BW904
   - id: p2i2oapbnxftdukj
-    name: Merkury BW904 Smart Bulb
+    manufacturer: Merkury
+    model: BW904
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rgbww_lightbulb.yaml

@@ -2,9 +2,9 @@ name: RGB warm white light
 legacy_type: feit_light_rgb_bulb
 products:
   - id: hpaeslvkx4znwzae
-    name: A60 RGB 1800-2700K light
+    model: A60 RGB 1800-2700K
   - id: 8cr0olwf9sphi0u4
-    name: Feit RGB Light Bulb
+    manufacturer: Feit
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/richelieu_undercabinet_lighting_pucks.yaml

@@ -1,7 +1,8 @@
 name: Accent lighting
 products:
   - id: bau7S9LJYvPgynWc
-    name: Richelieu tunable white LED puck light (166142030)
+    manufacturer: Richelieu
+    model: "166142030"
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/rinkmo_d2_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: lq0g9hpampbedce0
-    name: Rinkmo D2
+    manufacturer: Rinkmo
+    model: D2
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/rojeco_pet_feeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: hbiwalfrzqfzv2cq
-    name: Rojeco PTM-001
+    manufacturer: Rojeco
+    model: PTM-001
 entities:
   - entity: button
     icon: "mdi:food-drumstick"

custom_components/tuya_local/devices/rojeco_pet_feeder_ptm001_4l_single.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: opnbfbjlnpdjwior
-    name: Rojeco PTM-001 4L Single Bowl
+    manufacturer: Rojeco
+    model: PTM-001 4L Single Bowl
 entities:
   - entity: button
     icon: "mdi:food-drumstick"

custom_components/tuya_local/devices/rotenso_ronix_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: hw50w7qvxluhslkk
-    name: Rotenso Roni X
+    manufacturer: Rotenso
+    model: Roni X
 entities:
   - entity: climate
     translation_only_key: aircon_extra

custom_components/tuya_local/devices/royal_airconditioner.yaml

@@ -2,7 +2,8 @@ name: Air conditioner
 legacy_type: rotenso_ronir35wi_heatpump
 products:
   - id: 2si3Y6O3K2rK9XBr
-    name: Royal Sovereign RSAI-12SA mini split AC
+    manufacturer: Royal Sovereign
+    model: RSAI-12SA
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/royalclima_fresh_climate.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: mcnywzjlugvvvnjj
-    name: Royal fresh full inverter
+    manufacturer: Royal Clima
+    model: Fresh full inverter
 entities:
   - entity: climate
     translation_key: aircon_extra

custom_components/tuya_local/devices/royalclima_rcb150_ventilation.yaml

@@ -1,7 +1,8 @@
 name: Ventilation system
 products:
   - id: qcgxajmb0sdg608j
-    name: Royal Clima RCB 150
+    manufacturer: Royal Clima
+    model: RCB 150
 entities:
   - entity: fan
     translation_only_key: ventilation

custom_components/tuya_local/devices/rse_tywfh301_gate.yaml

@@ -1,7 +1,8 @@
 name: Gate controller
 products:
   - id: q4tn6xb10zncammj
-    name: Home Gate NI800z/NI600z
+    manufacturer: Home Gate
+    model: NI800z/NI600z
 entities:
   - entity: button
     name: Open

custom_components/tuya_local/devices/rtcz03_presencesensor.yaml

@@ -1,7 +1,7 @@
 name: Human presence detector
 products:
   - id: e833v6jexwfkjrij
-    name: RTCZ-03 human presence sensor
+    model: RTCZ-03
 entities:
   - entity: binary_sensor
     class: occupancy

custom_components/tuya_local/devices/rztk_aqua_pro_wifi_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: g7qj4zfr2rq5meak
-    name: Aqua Pro Wifi
+    manufacturer: RZTK
+    model: Aqua Pro Wifi
 entities:
   - entity: humidifier
     class: humidifier

custom_components/tuya_local/devices/s11_rfir_remote.yaml

@@ -2,11 +2,12 @@ name: Remote control
 legacy_type: moes_rfir_remote
 products:
   - id: nwpvjlq7qacvnqf3
-    name: S11+ (IR+RF Pro)
+    model: S11+ (IR+RF Pro)
   - id: wbaloeb3kiwwhads
-    name: Moes RF/IR remote
+    manufacturer: Moes
+    name: RF/IR remote
   - id: 0gawnyfgyneswent
-    name: IR Controller Pro
+    model: IR Controller Pro
 entities:
   - entity: remote
     dps:

custom_components/tuya_local/devices/sanden_gaua45hpd_heatpumpcontroller.yaml

@@ -1,7 +1,9 @@
 name: Water heater
 products:
   - id: ssqd7htb3tbhxqvk
-    name: Sanden GAU-A45HP heat pump controller
+    manufacturer: Sanden
+    model: GAU-A45HP
+    name: Heat pump controller
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/saswell_c16_thermostat.yaml

@@ -2,7 +2,8 @@ name: Thermostat
 legacy_type: thermoval_tvt40_thermostat
 products:
   - id: jIRwsT5yLPJO41Po
-    name: Thermoval TVT 40 / Saswell C16
+    manufacturer: Thermoval / Saswell
+    model: TVT 40 / C16
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/sboardiii_weigand_lock.yaml

@@ -1,7 +1,9 @@
 name: Door access
 products:
   - id: 5k8h97qska6pf5cm
-    name: Sboard III mini Wiegand access control interface
+    manufacturer: Secukey
+    model: Sboard III mini
+    name: Wiegand access control interface
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/scheeair_nova100_ventilationfan.yaml

@@ -2,7 +2,7 @@ name: Ventilation fan
 products:
   - id: v5yzxit33hd1btwx
     manufacturer: Scheeair
-    name: Nova 100
+    model: Nova 100
 entities:
   - entity: switch
     category: config

custom_components/tuya_local/devices/semptec_zx7007_heater.yaml

@@ -1,7 +1,8 @@
 name: IR heater
 products:
   - id: 34fyo4xuj16fzaqq
-    name: Semptec ZX7007
+    manufacturer: Semptec
+    model: ZX7007
 entities:
   - entity: climate
     translation_key: heater

custom_components/tuya_local/devices/sencor_air_conditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: ypgwqvhjrl5chq6h
-    name: Sencor SAC MT7048C
+    manufacturer: Sencor
+    model: SAC MT7048C
 entities:
   - entity: climate
     translation_only_key: aircon_extra

custom_components/tuya_local/devices/sensei_airconditioner.yaml

@@ -1,7 +1,7 @@
 name: Air conditioner
 products:
   - id: f3goccgfj6qino4c
-    name: Sensei Air Conditioner
+    manufacturer: Sensei
 entities:
   - entity: climate
     translation_key: aircon_extra

custom_components/tuya_local/devices/setti_czajnik_kettle.yaml

@@ -1,7 +1,9 @@
 name: Kettle
 products:
   - id: rsygyyeiyarl4urt
-    name: Czajnik Setti+ KT950W
+    manufacturer: Setti+
+    model: KT950W
+    name: Czajnik
 entities:
   - entity: water_heater
     icon: "mdi:kettle"

custom_components/tuya_local/devices/seven_channel_switch.yaml

@@ -1,7 +1,9 @@
 name: Seven channel switch
 products:
   - id: 7w1gnppunpyev9tj
-    name: Inna AUT000014 underefloor heating controller
+    manufacturer: Inna
+    model: AUT000014
+    name: Underfloor heating controller
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/sh07_sprinkler_controller.yaml

@@ -1,11 +1,13 @@
 name: Sprinkler controller
 products:
   - id: e8fwsklivj87msao
-    name: SH07-8
+    model: SH07-8
   - id: mxh2sjigimo463mg
-    name: Aquarobo SH07S-TY
+    manufacturer: Aquarobo
+    model: SH07S-TY
   - id: figmzixtki7bourh
-    name: Leictory LK06
+    manufacturer: Leictory
+    model: LK06
 entities:
   - entity: valve
     name: Valve 1

custom_components/tuya_local/devices/sherko_curtain.yaml

@@ -1,7 +1,7 @@
 name: Curtain motor
 products:
   - id: h2wipnagcunsar5r
-    name: SHerko curtain motor
+    manufacturer: Sherko
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/shinco_30d_dehumidifier.yaml

@@ -2,11 +2,14 @@ name: Dehumidifier
 legacy_type: alecoair_d12_home_dehumidifier
 products:
   - id: hp1sjssyokokbrsg
-    name: AlecoAir D12/D16 Home
+    manufacturer: AlecoAir
+    model: D12/D16 Home
   - id: to4nyl9qxvkqmcmk
-    name: Klarstein DryFy Connect
+    manufacturer: Klarstein
+    model: DryFy Connect
   - id: fvxjwu2oggajswbx
-    name: Shinco SDZ/YDZ-series
+    manufacturer: Shinco
+    model: SDZ/YDZ-series
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/siguro_sgrhdf300w_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: p3fnrnlcjm2yxeks
-    name: Siguro DH-F300W
+    manufacturer: Siguro
+    model: DH-F300W
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/silvercrest_coffee_maker.yaml

@@ -1,7 +1,8 @@
 name: Coffee maker
 products:
   - id: iegq4tjqeuiew5cl
-    name: Silvercrest SKMS 900 A1
+    manufacturer: Silvercrest
+    model: SKMS 900 A1
 entities:
   - entity: switch
     icon: "mdi:coffee-maker"

custom_components/tuya_local/devices/silvercrest_hf6602t_airfryer.yaml

@@ -1,7 +1,8 @@
 name: Air fryer
 products:
   - id: rmywxak3angdgh0d
-    name: SilverCrest HF-6602T
+    manufacturer: SilverCrest
+    model: HF-6602T
 entities:
   - entity: switch
     icon: "mdi:toaster-oven"

custom_components/tuya_local/devices/silvercrest_kettle.yaml

@@ -1,7 +1,8 @@
 name: Kettle
 products:
   - id: il4ofqon04yai1xe
-    name: Silvercrest WK0828RT
+    manufacturer: Silvercrest
+    model: WK0828RT
 entities:
   - entity: water_heater
     icon: "mdi:kettle"

custom_components/tuya_local/devices/simple_contact_sensor.yaml

@@ -1,7 +1,7 @@
 name: Window sensor
 products:
   - id: 0mjj67aaztcfmc3i
-    name: AW201_XR3
+    model: AW201_XR3
 entities:
   - entity: binary_sensor
     class: window

custom_components/tuya_local/devices/simple_dual_switch.yaml

@@ -1,7 +1,8 @@
 name: Dual switch
 products:
   - id: jupECyrdMrUifHd8
-    name: eMylo WiFi/RF 2 Gang
+    manufacturer: eMylo
+    model: WiFi/RF 2 Gang
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/simple_dual_switch_timer_v2.yaml

@@ -1,7 +1,8 @@
 name: Dual switch with timers
 products:
   - id: 7c35xxu0foeqpdka
-    name: BlitzWolf BW-SS5
+    manufacturer: BlitzWolf
+    model: BW-SS5
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/simple_gate_opener.yaml

@@ -2,7 +2,6 @@
 name: Simple garage-door-gate opener
 products:
   - id: b1uk4ftduaqopxv1
-    name: Garage-door-gate opener
 entities:
   - entity: cover
     class: gate

custom_components/tuya_local/devices/simple_switch_timer.yaml

@@ -1,9 +1,11 @@
 name: Simple switch with timer
 products:
   - id: r15JnoGqWPM4PPtl
-    name: Teckin SP21
+    manufacturer: Teckin
+    model: SP21
   - id: 5bvnmoqjth5nd4de
-    name: Teckin SP21/SP22/SP27
+    manufacturer: Teckin
+    model: SP21/SP22/SP27
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/simple_switch_timerv2.yaml

@@ -1,15 +1,18 @@
 name: Simple switch with timer
 products:
   - id: eetmtcempdyxgpx5
-    name: Nexxt 220v smartplug
+    manufacturer: Nexxt
+    model: 220v smartplug
   - id: 45gg9a0jfyzj1z1d
     name: Mini smart switch
   - id: qlrnevw57ezct7ta
-    name: On Wall WiFi Switch
+    name: Wall switch
   - id: flcvzjtnkhsreazp
-    name: GIRIER USB adaptor
+    manufacturer: GIRIER
+    name: USB adaptor
   - id: lbqau5negh2zizit
-    name: Kruidvat outdoor smartplug
+    manufacturer: Kruidvat
+    name: Outdoor smartplug
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/simple_triple_switch_timer.yaml

@@ -1,7 +1,7 @@
 name: Triple switch
 products:
   - id: 16621606d8bfc0d93558
-    name: KS-811-3
+    model: KS-811-3
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/single_phase_clamp_meter.yaml

@@ -1,7 +1,8 @@
 name: Clamp meter
 products:
   - id: gk3jvsduy5ixzff3
-    name: Meterk QS-WIFI-CT01
+    manufacturer: Meterk
+    model: QS-WIFI-CT01
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/sirena_ws902plus_siren.yaml

@@ -1,6 +1,7 @@
 name: Outdoor siren
 # products:
-#    name: Sirena Outdoor Strobe Siren WS-902 Plus
+#    manufacturer: Sirena
+#    model: WS-902 Plus
 entities:
   - entity: siren
     dps:

custom_components/tuya_local/devices/skyfan_dc_fan.yaml

@@ -1,7 +1,8 @@
 name: Fan
 products:
   - id: vzj97d3m05yjhchn
-    name: Skyfan DC
+    manufacturer: Skyfan
+    model: DC
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/skyfan_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Fan with light
 products:
   - id: pktxz1vynowmavuc
-    name: Skyfan DC
+    manufacturer: Skyfan
+    model: DC
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/smardeer_lock33.yaml

@@ -1,7 +1,8 @@
 name: Door lock
 products:
   - id: oufbykkic2alxcjw
-    name: SmarDeer Lock33
+    manufacturer: SmarDeer
+    model: Lock33
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/smart_led_strip.yaml

@@ -1,7 +1,7 @@
-name: Smart LED Strip
+name: LED Strip
 products:
   - id: oblx20mxzsclpahi
-    name: Nedis Smart LED Strip
+    manufacturer: Nedis
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/smart_mist3_fan.yaml

@@ -1,7 +1,9 @@
 name: Mist Fan
 products:
   - id: xlnzyrme4ddyzqhw
-    name: Smart Mist3 TX-1602MF
+    manufacturer: Smart
+    model: Mist3
+    model_id: TX-1602MF
 entities:
   - entity: fan
     translation_key: fan_with_presets

custom_components/tuya_local/devices/smart_multi_plug_4t_4usb.yaml

@@ -1,7 +1,7 @@
 name: Quad power strip + 4USB
 products:
   - id: rpnp3rtjjzbktign
-    name: Smart multi-plug 4T+4USB
+    model: "4T+4USB"
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/smart_powerstrip.yaml

@@ -1,7 +1,6 @@
-name: 4 outlet + USB powerstrip
+name: "4 outlet + USB powerstrip"
 products:
   - id: y7CxWXKi0EVL3cgB
-    name: smart Power Strip
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/smart_powerstrip_3_outlet_energy.yaml

@@ -1,7 +1,8 @@
 name: Triple monitoring powerstrip
 products:
   - id: y3vaekzobpkbcj0j
-    name: Eightree ET43 powerstrip
+    manufacturer: Eightree
+    model: ET43
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smart_siren_alarm.yaml

@@ -1,7 +1,6 @@
 name: Smart Alarm Siren
 products:
   - id: rtbaqdh2io1pmn19
-    name: Smart Siren
 entities:
   - entity: alarm_control_panel
     name: Status

custom_components/tuya_local/devices/smart_surge_protector_plug_2x2.yaml

@@ -1,7 +1,7 @@
 name: Two outlet two USB smartplug
 products:
   - id: cianx1tz1ifyvyqm
-    name: Surge protector plug 2x2
+    model: Surge protector plug 2x2
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smart_watering_device.yaml

@@ -1,7 +1,8 @@
 name: Smart watering device
 products:
   - id: abzzvtulukkwzynv
-    name: Becasmart BAF-908
+    manufacturer: Beca Smart
+    model: BAF-908
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/smartmcb_smt006_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: ntwmuj82anq1l92i
-    name: SmartMCB SMT006-10
+    manufacturer: SmartMCB
+    model: SMT006-10
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/smartmcb_smt006_energymeterv2.yaml

@@ -1,9 +1,11 @@
 name: Energy meter
 products:
   - id: 3xhdofmeo6lgpvd5
-    name: SmartMCB SMT006-8
+    manufacturer: SmartMCB
+    model: SMT006-8
   - id: i5mqmxkho1vahdt2
-    name: SmartMCB SMT006-8
+    manufacturer: SmartMCB
+    model: SMT006-8
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/smartmi_e1_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air Purifier
 products:
   - id: pwrmggdhwkz1lnvh
-    name: Smartmi E1
+    manufacturer: Smartmi
+    model: E1
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/smartplug_usb.yaml

@@ -1,7 +1,8 @@
 name: Smartplug with USB
 products:
   - id: zmql6aexy8ua5rox
-    name: Gosund SP112
+    manufacturer: Gosund
+    model: SP112
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smartplug_with_childlock.yaml

@@ -1,7 +1,8 @@
 name: Smartplug
 products:
   - id: r9xep1xwyoubglpn
-    name: SX1 reelay switch
+    model: SX1
+    name: Relay switch
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smartplugv1.yaml

@@ -2,9 +2,10 @@ name: Energy monitoring smartplug
 legacy_type: kogan_switch
 products:
   - id: 370053454855194e5607
-    name: Gosund EP2
+    manufacturer: Gosund
+    model: EP2
   - id: 37mnhia3pojleqfh
-    name: SP111-A
+    model: SP111-A
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smartplugv2_energy.yaml

@@ -1,15 +1,20 @@
 name: Advanced energy monitoring smartplug
 products:
   - id: auojpnb4hpc13ftb
-    name: Arlec PC191HA
+    manufacturer: Arlec
+    model: PC191HA
   - id: 2fxr6sttw70cgbau
-    name: Antela ZY-OYD-Y
+    manufacturer: Antela
+    model: ZY-OYD-Y
   - id: qiv5hllylfebpl4g
-    name: Eightree ET20
+    manufacturer: Eightree
+    model: ET20
   - id: 7k5zwdhwlnrtsuhu
-    name: SWE SAGEWE F2s501-GB
+    manufacturer: SWE SAGEWE
+    model: F2s501-GB
   - id: uqehhcrmk5depvtl
-    name: Smatrul 16A/20A
+    manufacturer: Smatrul
+    model: 16A/20A
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smartplugv2_energyv2.yaml

@@ -1,11 +1,13 @@
 name: Energy monitoring smartplug
 products:
   - id: jdj6ccklup7btq3a
-    name: Tongou TO-Q-SY1-JWT
+    manufacturer: Tongou
+    model: TO-Q-SY1-JWT
   - id: w906qkrrhd3otiwd
-    name: Moes ME322
+    manufacturer: Moes
+    model: ME322
   - id: ncwuazeo5y1pujun
-    name: STY-63TM
+    model: STY-63TM
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smartplugv2_energyv3.yaml

@@ -1,15 +1,18 @@
 name: Energy monitoring smartplug
 products:
   - id: 2iepauebcvo74ujc
-    name: Aubess 20A
+    manufacturer: Aubess
+    model: 20A
   - id: wrz6vzch8htux2zp
-    name: Elivco CB2S-16DL
+    manufacturer: Elivco
+    model: CB2S-16DL
   - id: 3lbgj7cu27nsmh0w
-    name: AT-Q-SY2-JWT
+    model: AT-Q-SY2-JWT
   - id: cipuwutzfuqk3iru
-    name: UNSH SMKG-KNL
+    model: UNSH SMKG-KNL
   - id: azpywu5zfg5wyzpn
-    name: EARU 1P Breaker
+    manufacturer: EARU
+    model: 1P Breaker
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/smoke_detector.yaml

@@ -1,7 +1,6 @@
 name: Smoke detector
 products:
   - id: lsjnzox4skgduemo
-    name: Unknown
 entities:
   - entity: binary_sensor
     class: smoke

custom_components/tuya_local/devices/snt957w_de_cbu_temp_humidity.yaml

@@ -1,7 +1,7 @@
 name: Temperature and humidity sensor
 products:
   - id: dnoq3j5m9nhxw9a1
-    name: SNT957W-DE CBU
+    model: SNT957W-DE CBU
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/snt957w_tde_temp.yaml

@@ -1,7 +1,7 @@
 name: Temperature sensor
 products:
   - id: fqs8czlq3m0seqyp
-    name: SNT957W-TDE
+    model: SNT957W-TDE
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/sobralik_water_fountain.yaml

@@ -1,7 +1,8 @@
 name: Pet water fountain
 products:
   - id: hpa87ady0hndivqn
-    name: Sobralik FW-W01
+    manufacturer: Sobralik
+    model: FW-W01
 entities:
   - entity: switch
     icon: "mdi:water-pump"

custom_components/tuya_local/devices/solaire_vitra_smart_heater_s2.yaml

@@ -1,7 +1,8 @@
 name: Panel heater
 products:
   - id: 8fczfuyd5dknvltq
-    name: Solaire Vitra S2
+    manufacturer: Solaire
+    model: Vitra S2
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/solar_inverter.yaml

@@ -1,7 +1,7 @@
 name: Smart Inverter
 products:
   - id: xcgsq9ggffz7lqhh
-    name: SG700MD
+    model: SG700MD
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/solar_inverter_gtb_series.yaml

@@ -1,7 +1,8 @@
 name: Solar inverter
 products:
   - id: czu7ynosrkxgbnsb
-    name: Solar Grid GTB Series
+    manufacturer: Solar Grid
+    model: GTB Series
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/soleusair_air_purifier.yaml

@@ -1,9 +1,11 @@
 name: Air purifier
 products:
   - id: kik7qavg2baebtk9
-    name: Soleusair KJ1000F A10
+    manufacturer: Soleusair
+    model: KJ1000F A10
   - id: 5xrkvysk7z6xrjum
-    name: Soleusair KJ760F A02
+    manufacturer: Soleusair
+    model: KJ760F A02
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/somgom_single_switch.yaml

@@ -1,9 +1,10 @@
 name: Wall switch
 products:
   - id: nqodepctqralr6su
-    name: Novadigital switch
+    manufacturer: Novadigital
   - id: vxo9yezswiumvync
-    name: PST WT-E1
+    manufacturer: PST
+    model: WT-E1
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/sonninkonig_eco_elegance_heater.yaml

@@ -1,7 +1,8 @@
 name: IR panel heater
 products:
   - id: xev18n44cvrmicqd
-    name: Sonnenkonig ECO 700
+    manufacturer: Sonnenkonig
+    model: ECO 700
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/sop10_sprinkler.yaml

@@ -1,7 +1,7 @@
 name: Water sprinkler
 products:
   - id: nxquc5lb
-    name: SOP10
+    model: SOP10
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/spaelectrics_light_controller.yaml

@@ -1,7 +1,8 @@
 name: Light controller
 products:
   - id: nzmllynz7tligqp0
-    name: Spa Electrics RM-WF Iris
+    manufacturer: Spa Electrics
+    model: RM-WF Iris
 entities:
   - entity: light
     name: Zone 1

custom_components/tuya_local/devices/speaka_sptvcm510_tvmount.yaml

@@ -1,7 +1,8 @@
 name: TV mount
 products:
   - id: etspz6new8zb1vdy
-    name: Speaka SP-TVCM-510
+    manufacturer: Speaka
+    model: SP-TVCM-510
 entities:
   - entity: button
     name: Stop

custom_components/tuya_local/devices/stadlerform_eva_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: xe3mxn6danpswfh3
-    name: Stadler Form Eva
+    manufacturer: Stadler Form
+    model: Eva
 entities:
   - entity: humidifier
     dps:

custom_components/tuya_local/devices/stadlerform_karl_humidifier.yaml

@@ -1,9 +1,11 @@
 name: Humidifier
 products:
   - id: gi2d3je5upa9ngx4
-    name: Stadler Form Karl
+    manufacturer: Stadler Form
+    model: Karl
   - id: qgv0pltei9nuuatv
-    name: Stadler Form Karl big
+    manufacturer: Stadler Form
+    model: Karl big
 entities:
   - entity: humidifier
     dps:

custom_components/tuya_local/devices/stadlerform_roger_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: bff126249136f505
-    name: Stadler Form Roger
+    manufacturer: Stadler Form
+    model: Roger
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/stepuptech_solar_inverter.yaml

@@ -1,7 +1,8 @@
 name: Solar inverter
 products:
   - id: r73jxzrtcda4uwwb
-    name: Stepuptech SP800
+    manufacturer: Stepuptech
+    model: SP800
 entities:
   - entity: sensor
     name: Daily energy out

custom_components/tuya_local/devices/stepuptech_solar_inverter_v2.yaml

@@ -1,7 +1,8 @@
 name: Solar inverter
 products:
   - id: 2zkyfrpmfxmex896
-    name: Stepuptech SPD-800
+    manufacturer: Stepuptech
+    model: SPD-800
 entities:
   - entity: sensor
     name: AC power

custom_components/tuya_local/devices/stl_siren.yaml

@@ -1,7 +1,8 @@
 name: Siren
 products:
   - id: DYgId0sz6zWlmmYu
-    name: STL siren alarm
+    manufacturer: STL
+    name: Siren alarm
 entities:
   - entity: siren
     dps:

custom_components/tuya_local/devices/sulion_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: 5baeoecnemrwonk6
-    name: Sulion Crixus L
+    manufacturer: Sulion
+    model: Crixus L
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/sunbeam_dual_bedwarmer.yaml

@@ -1,7 +1,8 @@
 name: Bed warmer
 products:
   - id: pjvxl1wsyqxivsaf
-    name: Sunbeam dual heated mattress pad
+    manufacturer: Sunbeam
+    name: Dual heated mattress pad
 entities:
   - entity: switch
     name: Combined switch

custom_components/tuya_local/devices/suntec_coolfix_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: 0ithwpdwkgyqfx54
-    name: Suntec Wellness Coolfixx
+    manufacturer: Suntec Wellness
+    model: Coolfixx
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/sws01_weather_station.yaml

@@ -1,7 +1,7 @@
 name: Weather station
 products:
   - id: fpgistthfiweyaqr
-    name: SWS-01 weather station
+    model: SWS-01
 entities:
   - entity: sensor
     name: Internal temperature

custom_components/tuya_local/devices/sygonix_smarter_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: 4xcjyqplnfenhplh
-    name: Sygonix Smarter
+    manufacturer: Sygonix
+    model: Smarter
 entities:
   - entity: humidifier
     class: dehumidifier