Products cleanup: C-D

- 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 `c` and `d`.

custom_components/tuya_local/devices/cadence_aroma_diffuser.yaml

@@ -1,7 +1,8 @@
 name: Aroma diffuser
 products:
   - id: 1sim2gu7dd5rh3j3
-    name: Cadence Ultrasonic
+    manufacturer: Cadence
+    name: Ultrasonic aroma diffuser
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/caldo_up_t_wifi.yaml

@@ -1,7 +1,8 @@
 name: Fan heater
 products:
   - id: dqy0z9997a18rkaw
-    name: Olimpia Splendid Caldo Up T
+    manufacturer: Olimpia Splendid
+    model: Caldo Up T
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/calex_aromadiffuser.yaml

@@ -1,7 +1,8 @@
 name: Aroma diffuser
 products:
   - id: orw9vhekocfzx78l
-    name: Calex v2.0
+    manufacturer: Calex
+    model: v2.0
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/calex_convector_heater.yaml

@@ -1,7 +1,7 @@
 name: Convection heater
 products:
   - id: yqnv4v88805rpkr1
-    name: Calex Smart Heater
+    manufacturer: Calex
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/calex_s45cleare27_light.yaml

@@ -1,7 +1,8 @@
 name: CCT lightbulb
 products:
   - id: q66b4arnni1rnqlk
-    name: Calex S45 Clear E27
+    manufacturer: Calex
+    model: S45 Clear E27
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/calibo_smart_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Fan with light
 products:
   - id: 78m2fjtcj26yab5a
-    name: Calibo Cloudfan DC with Light
+    manufacturer: Calibo
+    model: Cloudfan DC
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/camnsmart_e27_camera.yaml

@@ -1,7 +1,8 @@
 name: Camera
 products:
   - id: ivdxyvyy8aqzm1ix
-    name: Camnsmart E27TY
+    manufacturer: Camnsmart
+    model: E27TY
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/carro_ph805_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: g5wedazavod2wg3h
-    name: Carro PH-805-24
+    manufacturer: Carro
+    model: PH-805-24
 entities:
   - entity: humidifier
     class: humidifier

custom_components/tuya_local/devices/carro_pn04f02d_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: 6ahfblexspuaem65
-    name: Carro PN-04F02D
+    manufacturer: Carro
+    model: PN-04F02D
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/carro_smart_ceiling_fan_light.yaml

@@ -1,7 +1,7 @@
 name: Ceiling fan light
 products:
   - id: pwn8rplbjtokxaec
-    name: Carro (Qizheng) Fan Light
+    manufacturer: Carro / Qizheng
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/carson_cb.yaml

@@ -2,7 +2,8 @@ name: Air conditioner
 products:
   # original product id unknown: Carson CB PA280
   - id: 2tgd3qnobb1mcgd9
-    name: Shinco Yoau YWD1
+    manufacturer: Shinco Yoau
+    model: YWD1
     # also sold as Axelair Tempero CMM3000, Domair Callisto
     # (product id may be same or different?)
 entities:

custom_components/tuya_local/devices/casafan_ceiling_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan and light
 products:
   - id: qx9ovwpe9isccpb6
-    name: Casafan ECO Neo III
+    manufacturer: Casafan
+    model: ECO Neo III
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/casdon_td_pro_2.yaml

@@ -1,7 +1,8 @@
 name: Oven
 products:
   - id: wab6oustdukujpkn
-    name: Casdon TD Pro 2
+    manufacturer: Casdon
+    model: TD Pro 2
 entities:
   - entity: climate
     translation_only_key: oven

custom_components/tuya_local/devices/catit_pixi_6meal_feeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: wmkepdif6qzirl7a
-    name: Catit Pixi 6-Meal
+    manufacturer: Catit
+    model: Pixi 6-Meal
 entities:
   - entity: button
     name: Quick Feed

custom_components/tuya_local/devices/catit_pixi_smart_feeder.yaml

@@ -1,11 +1,13 @@
 name: Pet feeder
 products:
   - id: 8vwr6rfoaaxncjwj
-    name: Petoneer Nutri Mini
+    manufacturer: Petoneer
+    model: Nutri Mini
   - id: pxwlmmdodfppms3a
-    name: GiotoHun Pet feeder
+    manufacturer: GiotoHun
   - id: ojqmjnoxqygqldsp
-    name: PUPPY KITTY Automatic Cat & Dog Feeder
+    manufacturer: Puppy Kitty
+    name: Automatic pet feeder
 entities:
   - entity: button
     name: Quick Feed

custom_components/tuya_local/devices/catit_pixi_smart_fountain.yaml

@@ -1,7 +1,8 @@
 name: Water fountain
 products:
   - id: z3rpyvznfcch99aa
-    name: Catit Pixi smart fountain
+    manufacturer: Catit
+    model: Pixi smart fountain
 entities:
   - entity: switch
     icon: "mdi:water-pump"

custom_components/tuya_local/devices/cbi_astute_outdoor_smartswitch.yaml

@@ -1,7 +1,8 @@
 name: Switch
 products:
   - id: xzgtyrqbab8lm2zo
-    name: CBI Astute Smart Controller switch
+    manufacturer: CBI
+    model: Astute Smart Controller
 entities:
   - entity: switch
     class: switch

custom_components/tuya_local/devices/cc_curtain.yaml

@@ -1,7 +1,7 @@
 name: Curtain
 products:
   - id: dy1jPRPGVR9G7PWY
-    name: CC smart curtain 1
+    model: CC smart curtain 1
 entities:
   - entity: cover
     dps:

custom_components/tuya_local/devices/ccb11_blind_controller.yaml

@@ -1,7 +1,7 @@
 name: Blind controller
 products:
   - id: 3r8gc33pnqsxfe1g
-    name: CCB-11
+    model: CCB-11
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/cct_lightbulb.yaml

@@ -1,15 +1,18 @@
 name: CCT lightbulb
 products:
   - id: dqs8oqdeccnqjfkx
-    name: A60 lightbulb
+    model: A60
   - id: znfxaaxc89zz6m5a
-    name: A65 lightbulb
+    model: A65
   - id: c59bbbt5xsm6fkkk
-    name: Laser 10W Smart White Bulb E27
+    manufacturer: Laser
+    model: 10W smart white bulb E27
   - id: t6kkutyhtbbohacx
-    name: Connect 10W Smart White Bulb E27
+    manufacturer: Connect
+    model: 10W smart white bulb E27
   - id: owzzoxsdudnxgije
-    name: Genio CCT Downlight
+    manufacturer: Genio
+    name: CCT downlight
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/cct_modeless_lightbulb.yaml

@@ -1,7 +1,8 @@
 name: CCT light
 products:
   - id: ewrj9uit2axunpyn
-    name: Connect CSH-GU53WW5W
+    manufacturer: Connect
+    model: CSH-GU53WW5W
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/cct_v1_lightbulb.yaml

@@ -1,15 +1,20 @@
 name: CCT Light
 products:
   - id: xhkuywg6rwwqocl6
-    name: Connect White GU10
+    manufacturer: Connect
+    model: White GU10
   - id: hvfqgkigk9nj0p6p
-    name: Geeni GN-BW223-999
+    manufacturer: Geeni
+    model: GN-BW223-999
   - id: 41xqxqiflb6lqaqv
-    name: Geeni GN-BW223-999
+    manufacturer: Geeni
+    model: GN-BW223-999
   - id: gbi4ljmlyrxx23mz
-    name: Geeni GN-BW230-999
+    manufacturer: Geeni
+    model: GN-BW230-999
   - id: xhkuywg6rwwqocl6
-    name: Laser SMT-WWDL53-L
+    manufacturer: Laser
+    model: SMT-WWDL53-L
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/cecofry_5500_airfryer.yaml

@@ -1,7 +1,8 @@
 name: Air fryer
 products:
   - id: xxwvfk9qrn56r4n6
-    name: Cecofry 5500 Connected
+    manufacturer: Cecofry
+    model: "5500 Connected"
 entities:
   - entity: switch
     icon: "mdi:toaster-oven"

custom_components/tuya_local/devices/cecotec_bigdry_4000_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: d44nan1uokr1hlwf
-    name: Cecotec BigDry 4000 Expert
+    manufacturer: Cecotec
+    model: BigDry 4000 Expert
     # {"dps": {"1": true, "3": "60", "4": "low", "6": 54, "7": 23, "19": 0}}
 entities:
   - entity: humidifier

custom_components/tuya_local/devices/cecotec_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Fan with light
 products:
   - id: 9uydeea5iojq3msy
-    name: Cecotec AQUA CONNECTED
+    manufacturer: Cecotec
+    model: Aqua Connected
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/ceres_plus_petfeeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: 8zrzjldq07tlxnlv
-    name: Ceres Plus Momoschoice
+    manufacturer: "Momo's Choice"
+    model: Ceres Plus
 entities:
   - entity: sensor
     translation_key: status

custom_components/tuya_local/devices/cesmarthome_acwall_outlet.yaml

@@ -1,7 +1,8 @@
 name: Wall outlet
 products:
   - id: xca2lqfaztnmk5jh
-    name: CE Smart Home LQ-2-W3
+    manufacturer: CE Smart Home
+    model: LQ-2-W3
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/chanfok_fan_light.yaml

@@ -1,6 +1,7 @@
-name: Chanfok ceiling fan
+name: Ceiling fan
 products:
   - id: tvtzgei8bgaezsvi
+    manufacturer: Chanfok
     name: JST-DC-WYfen
 entities:
   - entity: fan

custom_components/tuya_local/devices/ciarra_cbcs4850_rangehood.yaml

@@ -1,7 +1,8 @@
 name: Range hood
 products:
   - id: aiwq2zdatwjllekd
-    name: Ciarra CBCS4850
+    manufacturer: Ciarra
+    model: CBCS4850
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/cleanair_604b_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: cqoisddoci9i3yer
-    name: Clean Air 604B Smart
+    manufacturer: Clean Air
+    model: 604B Smart
 entities:
   - entity: humidifier
     dps:

custom_components/tuya_local/devices/cleanair_605b_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: 7mijurr4i9e0ewat
-    name: Clean Air 605B Smart
+    manufacturer: Clean Air
+    model: 605B Smart
 entities:
   - entity: humidifier
     dps:

custom_components/tuya_local/devices/cleverio_ad100_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: jkscqnjueuczotho
-    name: Cleverio AD100
+    manufacturer: Cleverio
+    model: AD100
 entities:
   - entity: fan
     name: Dehumidifier

custom_components/tuya_local/devices/cleverio_ap100_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: 6bspwvsqhl4vuanj
-    name: Cleverio AP100
+    manufacturer: Cleverio
+    model: AP100
 entities:
   - entity: fan
     icon: "mdi:air-purifier"

custom_components/tuya_local/devices/cleverio_cd200_doorbell.yaml

@@ -1,7 +1,8 @@
 name: Video doorbell
 products:
   - id: tpd76kmnwwsun4iq
-    name: Cleverio CD-200
+    manufacturer: Cleverio
+    model: CD-200
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/cleverio_pf100_petfeeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: wfkzyy0evslzsmoi
-    name: Cleverio PF100
+    manufacturer: Cleverio
+    model: PF100
 entities:
   - entity: number
     name: Manual feed

custom_components/tuya_local/devices/cnc_ycb9zf_breaker.yaml

@@ -1,7 +1,8 @@
 name: Circuit breaker
 products:
   - id: bryydwbntbjkq8pk
-    name: Faens FSZN03-100AP 2P
+    manufacturer: Faens
+    model: FSZN03-100AP 2P
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/co2_box.yaml

@@ -1,7 +1,7 @@
 name: CO2 box
 products:
   - id: ot8jbazilxrskg6s
-    name: DCR-CO2
+    model: DCR-CO2
 entities:
   - entity: sensor
     class: carbon_dioxide

custom_components/tuya_local/devices/comon_lights.yaml

@@ -1,7 +1,8 @@
 name: String light controller
 products:
   - id: swzi5fagtytgxe0f
-    name: Lexi Lighting LLXAPT01
+    manufacturer: Lexi Lighting
+    model: LLXAPT01
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/compteur_energy_meter.yaml

@@ -1,7 +1,7 @@
 name: Energy meter
 products:
   - id: 1whdy4a8ypamjloi
-    name: Compteur electric meter
+    manufacturer: Compteur
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/confortotal_minisplit.yaml

@@ -1,7 +1,9 @@
 name: Air conditioner
 products:
   - id: mzhwsoeaumuxleaf
-    name: Confortotal Mini Split CICON242
+    manufacturer: Confortotal
+    model: Mini Split
+    model_id: CICON242
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/cooper_hunter_air_conditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: a38i3yjbj4b4r9o0
-    name: Cooper and Hunter Nordic Evo NG
+    manufacturer: Cooper and Hunter
+    model: Nordic Evo NG
 entities:
   - entity: climate
     translation_only_key: aircon_extra

custom_components/tuya_local/devices/costway_portable_ac.yaml

@@ -1,7 +1,7 @@
 name: Portable air conditioner
 products:
   - id: 86sjxqebxymrjt3z
-    name: COSTWAY
+    manufacturer: Costway
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/create_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan with light
 products:
   - id: p8z27dfdwc4riyp9
-    name: Create XW-FAN-215-D
+    manufacturer: Create
+    model: XW-FAN-215-D
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/create_warmtoweladvance_heater.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: cior1o59zipid8xo
-    name: Create Warm Towel Advance
+    manufacturer: Create
+    model: Warm Towel Advance
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/cronos_gphdda_heater.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: gdxxobacdlckd0ye
-    name: Cronos GPH-D-DA
+    manufacturer: Cronos
+    model: GPH-D-DA
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/currysmarter_6gen_rollershutter.yaml

@@ -1,7 +1,8 @@
 name: Roller shutter
 products:
   - id: csgb8eqhczvjaetl
-    name: Curry Smarter 6Gen
+    manufacturer: Curry Smarter
+    model: "6Gen"
 entities:
   - entity: cover
     class: shutter

custom_components/tuya_local/devices/daewoo_dhome_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: 4aeadm1xijnxjsu6
-    name: Daewoo DHome OL-A011
+    manufacturer: Daewoo
+    model: DHome OL-A011
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/deakon_evi_waterheatpump.yaml

@@ -1,7 +1,8 @@
 name: Radiator heatpump
 products:
   - id: 02ek8thasvo40fmd
-    name: Deakon EVI A2pro
+    manufacturer: Deakon
+    model: EVI A2pro
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/deltaco_shlw5m_ledstrip.yaml

@@ -1,7 +1,8 @@
 name: LED strip
 products:
   - id: gplzywt8cht24mhs
-    name: DELTACO SH-LW5M
+    manufacturer: Deltaco
+    model: SH-LW5M
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/depuley_smart_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan light
 products:
   - id: czvfkmtazfs0ohaq
-    name: Depuley WS-FPZ37-18I-EU
+    manufacturer: Depuley
+    model: WS-FPZ37-18I-EU
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/desk_lamp.yaml

@@ -1,7 +1,8 @@
 name: Desk Lamp
 products:
   - id: b0j0lto1o0ijwb39
-    name: Desk Lamp Setti+ SL601
+    manufacturer: Setti+
+    model: SL601
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/deta_dimmer_switch.yaml

@@ -1,7 +1,8 @@
 name: Dimmer switch
 products:
   - id: zdbapiyvwyi4wtrr
-    name: Deta 6910HA series2
+    manufacturer: Deta
+    model: 6910HA series2
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/digoo_hamb_alarm.yaml

@@ -1,7 +1,8 @@
 name: Alarm system
 products:
   - id: a4xyigjpkcmfafvh
-    name: Digoo DG-HAMB
+    manufacturer: Digoo
+    model: DG-HAMB
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/diivoo_dwv010.yaml

@@ -1,7 +1,8 @@
 name: Dual water timer
 products:
   - id: r6ya07uz
-    name: Diivoo DWV010
+    manufacturer: Diivoo
+    model: DWV010
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/diivoo_wt05.yaml

@@ -15,7 +15,8 @@
 name: Dual water timer
 products:
   - id: fdrbxxbg
-    name: Diivoo WT-05
+    manufacturer: Diivoo
+    model: WT-05
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/dimming_light_track.yaml

@@ -1,7 +1,8 @@
 name: Dimming CCT light
 products:
   - id: fkxcslivaluonzdp
-    name: LightStar track light
+    manufacturer: LightStar
+    name: Track light
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/dimming_lightbulb.yaml

@@ -1,11 +1,18 @@
 name: Dimming lightbulb
 products:
   - id: uoqzzanrvopvxddl
-    name: Deta Grid Connect Smart 18W 1900lm Daylight T8 Tube DET018HA
+    manufacturer: Deta
+    model: Grid Connect Smart 18W 1900lm
+    name: Daylight T8 tube
+    model_id: DET018HA
   - id: vjapigi170njdq09
-    name: Arlec Smart 4W 380lm Candle Dimmable Bulb GLD060HA
+    manufacturer: Arlec
+    model: Smart 4W 380lm
+    name: Candle dimmable bulb
+    model_id: GLD060HA
   - id: aok3caeleulg1neh
-    name: S10 wireless dimmer
+    model: S10
+    name: Wireless dimmer
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/ditua_dt1522yn_aromadiffuser.yaml

@@ -1,9 +1,10 @@
 name: Aroma diffuser
 products:
   - id: 6ASdNwe9IdaewQEl
-    name: Ditua DT-1522-YN
+    manufacturer: Ditua
+    model: DT-1522-YN
   - id: venoaj75waptukdf
-    name: Sierra Modern Home diffuser
+    manufacturer: Sierra Modern Home
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/djive_arc_fan.yaml

@@ -1,7 +1,8 @@
 name: Humidifying fan
 products:
   - id: bf5fd02f13d3f6d92exy2t
-    name: djive Flowmate ARC Humidifier
+    manufacturer: djive
+    model: Flowmate ARC
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/doel_tiplus_litterbox.yaml

@@ -1,7 +1,8 @@
 name: Litter box
 products:
   - id: ijas23irjjaenllv
-    name: DOEL Ti+
+    manufacturer: DOEL
+    model: Ti+
 entities:
   - entity: sensor
     name: Cat weight

custom_components/tuya_local/devices/dongguan_electric_curtain.yaml

@@ -1,7 +1,8 @@
 name: Curtain robot
 products:
   - id: kcy0x4pi
-    name: Dongguan LY1678-2
+    manufacturer: Dongguan Lianyou
+    model: LY1678-2
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/dongguan_garage_door_opener.yaml

@@ -5,7 +5,8 @@
 name: Garage opener
 products:
   - id: 1wwbzczt9hrtwqjr
-    name: Dongguan PJ-WGDOOR01
+    manufacturer: Dongguan Pinjia
+    model: PJ-WGDOOR01
 entities:
   - entity: cover
     class: garage

custom_components/tuya_local/devices/dooya_curtain.yaml

@@ -2,7 +2,7 @@ name: Curtain
 legacy_type: smartcurtain_acs_wt
 products:
   - id: spjpuwf1u2dc7tlt
-    name: SmartCurtain 3
+    model: SmartCurtain 3
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/dr_heater_dr008_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Floor thermostat
 # products:
 #   - id: UNKNOWN
-#     name: Dr. Heater DR-008
+#     manufacturer: Dr. Heater
+#     model: DR-008
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/dream_maker_feel_fan.yaml

@@ -1,7 +1,9 @@
 name: Pedestal Fan
 products:
   - id: lf3n6whotmyd1d1q
-    name: Dream Maker Feel Fan DM01
+    manufacturer: Dream Maker
+    model: Feel Fan
+    model_id: DM01
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/dreamlight_led_strip.yaml

@@ -1,7 +1,8 @@
 name: RGBCW light strip
 products:
   - id: aok3caeleulg1neh
-    name: LSC LED Strip RGBIC+CCT 2x5M
+    manufacturer: LSC
+    model: RGBIC+CCT 2x5M
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/dry_pury_evo_dehumidifier.yaml

@@ -1,7 +1,9 @@
 name: Dehumidifier
 products:
   - id: oya6k3fqen43zyi7
-    name: Argo DRY PURY EVO WF 21
+    manufacturer: Argo
+    model: Dry Pury EVO
+    model_id: WF21
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/dts238_7_energy_meter.yaml

@@ -1,7 +1,7 @@
 name: Energy meter
 products:
   - id: 1rlikmowi2erb6qw
-    name: DTS238-7
+    model: DTS238-7
 entities:
   - entity: sensor
     name: Total energy

custom_components/tuya_local/devices/dual_dimmer_module.yaml

@@ -1,7 +1,7 @@
 name: Dual dimmer
 products:
   - id: 3ovuf2vazfsz2hfd
-    name: LG921
+    model: LG921
 entities:
   - entity: light
     name: Light 1

custom_components/tuya_local/devices/dual_power_monitor_smartplugv2.yaml

@@ -1,9 +1,11 @@
 name: Dual smartplug
 products:
   - id: 3jnmzqoyuopg4vtf
-    name: Deltaco SH-P02
+    manufacturer: Deltaco
+    model: SH-P02
   - id: arf4t5idnhpt88ii
-    name: Smatrul dual wall plug
+    manufacturer: Smatrul
+    name: Dual wall plug
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/duux_blizzard_portable_aircon.yaml

@@ -1,9 +1,11 @@
 name: Air conditioner
 products:
   - id: zhmv8syot6ye4kjo
-    name: Duux Blizzard
+    manufacturer: Duux
+    model: Blizzard Smart
   - id: 1wfuo7w1yoejmgbn
-    name: Klarstein Kraftwerk Smart
+    manufacturer: Klarstein
+    model: Kraftwerk Smart
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/duux_bright_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: go2ndjijilncwuf7
-    name: Duux Bright
+    manufacturer: Duux
+    model: Bright
 entities:
   - entity: fan
     translation_key: fan_with_presets

custom_components/tuya_local/devices/duux_whisper_fan.yaml

@@ -1,7 +1,8 @@
 name: Pedestal fan
 products:
   - id: dune79w7bsu6dg3e
-    name: Duux Whisper Flex
+    manufacturer: Duux
+    model: Whisper Flex
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/duux_whisper_flex_ultimate_fan.yaml

@@ -1,7 +1,8 @@
 name: Portable Fan
 products:
   - id: cjsa4k7tqbpuyq3l
-    name: Duux Whisper Flex Ultimate
+    manufacturer: Duux
+    model: Whisper Flex Ultimate
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/dynasty_btx_fireplace.yaml

@@ -1,7 +1,8 @@
 name: Fireplace
 products:
   - id: 6lmohn7hdu9uh78r
-    name: Dynasty BTX Fireplace
+    manufacturer: Dynasty
+    model: BTX
 entities:
   - entity: climate
     icon: "mdi:fireplace"