Products cleanup: L-M

- 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 `l` and `m`.

custom_components/tuya_local/devices/ledkia_fan_light.yaml

@@ -1,7 +1,8 @@
 name: Light and fan
 products:
   - id: u5ovvhurbvynvspv
-    name: Ledkia fan and light controller
+    manufacturer: Ledkia
+    name: Fan and light controller
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/ledlux_thermostat.yaml

@@ -1,7 +1,8 @@
-name: LEDLUX thermostat
+name: Thermostat
 products:
   - id: atico42xjbgqgiys
-    name: Smart Boiler
+    manufacturer: LEDLUX
+    name: Smart boiler
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/lefant_ls1_vacuum.yaml

@@ -1,7 +1,8 @@
-name: Lefant vacuum
+name: Robot vacuum
 products:
   - id: 4tt4wulynvwcqicp
-    name: Lefant LS1 Pro
+    manufacturer: Lefant
+    model: LS1 Pro
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lefant_m213_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: drxonbesvmloh833
-    name: Lefant M213
+    manufacturer: Lefant
+    model: M213
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lefant_n3_vacuum.yaml

@@ -1,9 +1,11 @@
 name: Robot vacuum
 products:
   - id: yn442adgwn5ffqmz
-    name: Lefant N3
+    manufacturer: Lefant
+    model: N3
   - id: jtna6ihybmr0mxg8
-    name: Lefant N3
+    manufacturer: Lefant
+    model: N3
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lefant_t700_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: izivjmyjsajl9jdh
-    name: Lefant T700
+    manufacturer: Lefant
+    model: T700
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lehmann_lhohc2013c_radiator.yaml

@@ -1,7 +1,8 @@
 name: Radiator
 products:
   - id: wcpmk08nnnynbhy7
-    name: Lehmann LHOHC-2013C
+    manufacturer: Lehmann
+    model: LHOHC-2013C
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/lenovo_e1_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: lec6zthbnidtvk2g
-    name: Lenovo E1
+    manufacturer: Lenovo
+    model: E1
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/leos_loo_too.yaml

@@ -1,7 +1,8 @@
 name: Pet toilet
 products:
   - id: 1badzyvwh1e1hrog
-    name: "Leo's Loo Too"
+    manufacturer: "Leo's Loo"
+    model: Too
 entities:
   - entity: sensor
     name: Times used today

custom_components/tuya_local/devices/lexy_f501_fan.yaml

@@ -1,7 +1,8 @@
 name: Fan
 products:
   - id: unqopjvzu4ut6hb0
-    name: Lexy F501 fan
+    manufacturer: Lexy
+    model: F501
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/liectroux_g7_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: bvcx2bum8jsb4zra
-    name: Liectroux G7
+    manufacturer: Liectroux
+    model: G7
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/liectroux_xr500_t3_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: wvk5sm5nr0tkij3b
-    name: Liectroux XR500 T3
+    manufacturer: Liectroux
+    model: XR500 T3
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lifubide_x600_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: t40kx2rdqjzjss4a
-    name: Lifubide X600
+    manufacturer: Lifubide
+    model: X600
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/light_string.yaml

@@ -1,7 +1,8 @@
 name: Fairy lights
 products:
   - id: rqsvgaquywwekm6x
-    name: Popotan Smart Fairy String Lights
+    manufacturer: Popotan
+    name: Fairy string lights
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/lindasmart_7s_doorbell.yaml

@@ -1,7 +1,8 @@
 name: Video doorbell
 products:
   - id: thmj9wewi8yhouo4
-    name: Linda Smart 7S
+    manufacturer: Linda Smart
+    model: 7S
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/linkoze_dual_button.yaml

@@ -1,7 +1,8 @@
 name: Dual buttons
 products:
   - id: l8yaz4um5b3pwyvf
-    name: Linkoze LKWSW201
+    manufacturer: Linkoze
+    model: LKWSW201
 entities:
   - entity: event
     name: Button 1

custom_components/tuya_local/devices/littepets.yaml

@@ -1,7 +1,8 @@
 name: Cat litter box
 products:
   - id: jdxbiz2ca8x2mbfk
-    name: Littepets Cute Baby MA2 Series
+    manufacturer: Littepets
+    model: Cute Baby MA2 Series
 entities:
   - entity: switch
     name: Power

custom_components/tuya_local/devices/loeffen_LFIM6000_icecubemaker.yaml

@@ -1,7 +1,8 @@
 name: Ice cube maker
 products:
   - id: 2y44i6euwk9eeiz8
-    name: Loeffen LFIM6000
+    manufacturer: Loeffen
+    model: LFIM6000
 entities:
   - entity: switch
     icon: "mdi:delete-variant"

custom_components/tuya_local/devices/loonas_curtain.yaml

@@ -2,9 +2,11 @@ name: Curtain
 legacy_type: yueqingcombo_yet848pc_curtain
 products:
   - id: wraaecjqfiirj8go
-    name: Loonas curtain motor
+    manufacturer: Loonas
+    name: Curtain motor
   - id: f6jujmx0is5td50x
-    name: Zemismart BCM500DS-TYW
+    manufacturer: Zemismart
+    model: BCM500DS-TYW
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/loratap_curtain_switch.yaml

@@ -1,9 +1,11 @@
 name: Simple curtain switch
 products:
   - id: tuh2eatk4hsq336s
-    name: Loratap SC500W-V1
+    manufacturer: Loratap
+    model: SC500W-V1
   - id: hwbhrbadjynv7w70
-    name: Zemismart ZM16L
+    manufacturer: Zemismart
+    model: ZM16L
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/loratap_curtain_switch_QCSC400ZB-V2.yaml

@@ -1,7 +1,8 @@
 name: Curtain switch
 products:
   - id: qa8s8vca
-    name: LoraTap QCSC400ZB-V2
+    manufacturer: LoraTap
+    model: QCSC400ZB-V2
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/loratap_dual_switch.yaml

@@ -1,7 +1,8 @@
 name: Dual switch
 products:
   - id: keyjnuy4s3kre7m7
-    name: LoraTap RR620W-JL
+    manufacturer: LoraTap
+    model: RR620W-JL
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/loratap_garage_door.yaml

@@ -1,8 +1,10 @@
 name: Garage door
 products:
   - id: kksjmhr9nhjudvzo
-    name: LoraTap GDC100W
+    manufacturer: LoraTap
+    model: GDC100W
   - id: keyftvxappyrem5a
+    manufacturer: LoraTap
 entities:
   - entity: cover
     class: garage

custom_components/tuya_local/devices/loratap_relay.yaml

@@ -1,7 +1,8 @@
 name: Relay switch
 products:
   - id: owzofmjyg7foteb6
-    name: Loratap RR500W
+    manufacturer: Loratap
+    model: RR500W
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/loratap_wifi_curtain_switch_double.yaml

@@ -1,7 +1,8 @@
 name: Double curtain switch
 products:
   - id: zqypumy8ot4clzyi
-    name: Loratap QCSC420W
+    manufacturer: Loratap
+    model: QCSC420W
 entities:
   - entity: cover
     name: Curtain 1

custom_components/tuya_local/devices/loratap_zigbee_curtain.yaml

@@ -1,9 +1,10 @@
 name: Curtain
 products:
   - id: 8kzqqzu4
-    name: Loratap SC500ZB-V2
+    manufacturer: Loratap
+    model: SC500ZB-V2
   - id: v7ooovn9oamttmre
-    name: Loratap WiFi curtain
+    manufacturer: Loratap
 entities:
   - entity: cover
     class: shutter

custom_components/tuya_local/devices/loratap_zigbee_six_switch.yaml

@@ -1,6 +1,7 @@
 name: Six button remote
 products:
   - id: iszegwpd
+    manufacturer: LoraTap
     name: Six gang Zigbee remote
 entities:
   - entity: event

custom_components/tuya_local/devices/loycco_sound_nightlight.yaml

@@ -2,7 +2,8 @@ name: Sound machine nightlight
 legacy_type: momcozy_white_noise_machine
 products:
   - id: woqiobw0jfafgmar
-    name: Momland nightlight with white noise
+    manufacturer: Momland
+    name: Nightlight with white noise
 entities:
   - entity: light
     translation_key: nightlight

custom_components/tuya_local/devices/ls830ty_curtain.yaml

@@ -1,7 +1,7 @@
 name: Curtain
 products:
   - id: 550grkojy40jodv0
-    name: LS830-TY
+    model: LS830-TY
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/lsc_ptz_camera.yaml

@@ -1,7 +1,8 @@
 name: Camera
 products:
   - id: n7h0m2x7i2yzol0p
-    name: LSC PTZ
+    manufacturer: LSC Smart Connect
+    model: PTZ
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/lsc_smart_ceiling_light.yaml

@@ -1,8 +1,7 @@
 name: CCT + RGB Ceiling Light
 products:
   - id: bwyutsrcsnwf3p5o
-    name: LSC Smart Connect
-
+    manufacturer: LSC Smart Connect
 entities:
   - entity: light
     icon: mdi:circle

custom_components/tuya_local/devices/lscsmartconnect_gardenspotlights.yaml

@@ -1,7 +1,8 @@
 name: Lighting
 products:
   - id: key8u54q9dtru5jw
-    name: LSC Smart Connect spots de jardin LED intelligents
+    manufacturer: LSC Smart Connect
+    name: Spots de jardin LED intelligents
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/lscsmartconnect_rgbcct_bulb.yaml

@@ -1,8 +1,8 @@
 name: RGB-CCT light
 products:
   - id: hpaeslvkx4znwzae
-    name: LSC SMART Connect A60 RGB-CCT
-
+    manufacturer: LSC Smart Connect
+    model: A60 RGB-CCT
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/lublueblu_sl60d_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: tdxitkhbixikp8eh
-    name: Lubluelu SL60D
+    manufacturer: Lubluelu
+    model: SL60D
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/lucci_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling Fan
 products:
   - id: U8wU126HQlIeQHvS
-    name: Lucci Connect WiFi Fan Remote
+    manufacturer: Lucci Connect
+    name: WiFi fan remote
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/lucking_hs6_lock.yaml

@@ -1,7 +1,8 @@
 name: Door lock
 products:
   - id: 7veecefmxfxsu0b8
-    name: Lucking HF06EM/HF06MF-W-WIFI
+    manufacturer: Lucking
+    model: HF06EM/HF06MF-W-WIFI
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/luko_dehumidifier.yaml

@@ -1,7 +1,7 @@
 name: Dehumidifier
 products:
   - id: 4w2fzgr62c1oyjsx
-    name: Luko dehumidifier
+    manufacturer: Luko
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/lyfco_portable_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: gwwxvfg8auctbnpr
-    name: Lyfco OL-A012
+    manufacturer: Lyfco
+    model: OL-A012
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/lytmi_hdmisync_backlight.yaml

@@ -1,9 +1,11 @@
 name: HDMI sync backlight
 products:
   - id: js0t2z9y1tnphvds
-    name: Lytmi Fantasy/Neo 3
+    manufacturer: Lytmi
+    model: Fantasy/Neo 3
   - id: bfedc6cf9dcae291b04ecj
-    name: Lytmi Fantasy 3
+    manufacturer: Lytmi
+    model: Fantasy 3
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/m515_curtain_motor.yaml

@@ -1,7 +1,7 @@
 name: Curtain motor
 products:
   - id: t6ief6k56sapz1ey
-    name: M515EGWT v2
+    model: M515EGWT v2
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/madimack_eco_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Pool heatpump
 products:
   - id: kwrvh8zwvbbyp086
-    name: Madimack Eco 16kW
+    manufacturer: Madimack
+    model: Eco 16kW
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/madimack_elite_v3_heatpump_updated.yaml

@@ -1,7 +1,8 @@
 name: Pool heatpump
 products:
   - id: kwrvh8zwvbbyp086
-    name: Madimack Elite V3 11-40kW
+    manufacturer: Madimack
+    model: Elite V3 11-40kW
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/madimack_inverflow_pro.yaml

@@ -1,7 +1,8 @@
 name: Pool pump
 products:
   - id: ircs2n82vgrozoew
-    name: Madimack Inverflow Pro P300i
+    manufacturer: Madimack
+    model: Inverflow Pro P300i
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/makegood_switch_dual_timer-energy.yaml

@@ -1,7 +1,8 @@
 name: Dual switch
 products:
   - id: XdGCESvXTI5Mvfx2
-    name: MakeGood 2 Gang Switch (MG-MD04W)
+    manufacturer: MakeGood
+    model: MG-MD04W
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/malmbergs_dual_dimmer.yaml

@@ -1,7 +1,8 @@
 name: Dual dimmer
 products:
   - id: isstlkzmlurfcc6e
-    name: Malmbergs QS-WIFI-D02-TRIAC-2C
+    manufacturer: Malmbergs
+    model: QS-WIFI-D02-TRIAC-2C
 entities:
   - entity: light
     name: Dimmer 1

custom_components/tuya_local/devices/malmbergs_single_dimmer.yaml

@@ -1,7 +1,8 @@
 name: Dimmer
 products:
   - id: yrli99lsgtmebarq
-    name: Malmbergs QS-WIFI-D02-TRIAC
+    manufacturer: Malmbergs
+    model: QS-WIFI-D02-TRIAC
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/mamnv_br151_vacuum_and_mop.yaml

@@ -1,7 +1,8 @@
 name: Vacuum and mop
 products:
   - id: ela0pxryflaldubr
-    name: MAMNV BR151
+    manufacturer: MAMNV
+    model: BR151
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/marpou_ceiling_lamp_ledlight.yaml

@@ -1,7 +1,8 @@
 name: RGB ceiling light
 products:
   - id: eb93523c41813016ac6ay1
-    name: Marpou Five way ceiling lamp
+    manufacturer: Marpou
+    name: Five way ceiling lamp
 entities:
   - entity: light
     icon: "mdi:wall-sconce-flat-outline"

custom_components/tuya_local/devices/matsee_2wayv2_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Bidirectional energy meter
 products:
   - id: v5jlnn5hwyffkhp3
-    name: MatSee Plus bidirectional 2 channel clamp meter
+    manufacturer: MatSeePlus
+    name: Bidirectional 2 channel clamp meter
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/mayborn_groclock.yaml

@@ -1,7 +1,8 @@
 name: Alarm clock
 products:
   - id: pnauiuyatd821djd
-    name: Mayborn GroClock Connect
+    manufacturer: Mayborn
+    model: GroClock Connect
 entities:
   - entity: siren
     name: Music

custom_components/tuya_local/devices/meaco_aretetwo_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: hrqj115cek0tuddi
-    name: MeacoDry Arete Two 10L
+    manufacturer: MeacoDry
+    model: Arete Two 10L
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/medion_life_p1002.yaml

@@ -1,7 +1,8 @@
 name: Portable air conditioner
 products:
   - id: tqgodaa9suvtbflg
-    name: Medion LIFE P1002
+    manufacturer: Medion
+    model: LIFE P1002
 entities:
   - entity: climate
     icon: "mdi:air-conditioner"

custom_components/tuya_local/devices/medion_s10_vacuum.yaml

@@ -1,7 +1,9 @@
 name: Robot vacuum
 products:
   - id: dxzaldz77vzlxauh
-    name: Medion S10 SW (MD19601)
+    manufacturer: Medion
+    model: S10 SW
+    model_id: MD19601
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/medion_s20_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: ltp2oxcyx2l80unp
-    name: Medion S20-SW
+    manufacturer: Medion
+    model: S20-SW
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/medion_x10sw_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: hyzraigatjc4zr5n
-    name: Medion X10 SW
+    manufacturer: Medion
+    model: X10 SW
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/mellerware_citymove_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: sayafukjeqp9kupy
-    name: Mellerware City Move
+    manufacturer: Mellerware
+    model: City Move
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/mellerware_comfy_radiator.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: 5jidkruwamydvcfk
-    name: Mellerware Comfy Medium
+    manufacturer: Mellerware
+    model: Comfy Medium
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/minoston_timer_switch.yaml

@@ -1,7 +1,8 @@
 name: Timer switch
 products:
   - id: ae0y7quogjcnzery
-    name: Minoston nhT06-WIFI
+    manufacturer: Minoston
+    model: nhT06-WIFI
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/mirabella_genio_motion_sensor.yaml

@@ -1,7 +1,7 @@
 name: Motion sensor
 products:
   - id: p0y7ucexietpcqlq
-    name: Mirabella Genio Motion Sensor
+    manufacturer: Mirabella Genio
 entities:
   - entity: binary_sensor
     class: motion

custom_components/tuya_local/devices/mirabella_genio_usb.yaml

@@ -2,9 +2,11 @@ name: Smartplug with timer
 products:
   # Original product id unknown: Mirabella Genio USB smartplug
   - id: PGEkBctAbtzKOZng
-    name: Maxcio W-DE004
+    manufacturer: Maxcio
+    model: W-DE004
   - id: O0YnvNLlDWbJd4KC
-    name: Hyleton 315
+    manufacturer: Hyleton
+    model: "315"
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/mirabella_geniopixel_light.yaml

@@ -1,7 +1,8 @@
 name: Ceiling light
 products:
   - id: kllgg1iuwrtcvlnp
-    name: Mirabella Genio Pixel LED Oval light
+    manufacturer: Mirabella Genio
+    model: Pixel LED Oval light
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/mirabella_power_strip.yaml

@@ -1,7 +1,8 @@
 name: Power board
 products:
   - id: 5dvqb3eeuhhnjnlr
-    name: Genio Smart 2Gnd
+    manufacturer: Mirabella Genio
+    model: Smart 2Gnd
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/modena_es15sky_waterheater.yaml

@@ -1,7 +1,8 @@
 name: Water heater
 products:
   - id: sbno8dlqbq1kjlku
-    name: Modena ES-15-SKY
+    manufacturer: Modena
+    model: ES-15-SKY
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/modernflames_orion_fireplace.yaml

@@ -1,7 +1,8 @@
 name: Fireplace
 products:
   - id: buigpagr3xzmj6zk
-    name: Modern Flames Orion
+    manufacturer: Modern Flames
+    model: Orion
 entities:
   - entity: climate
     icon: "mdi:campfire"

custom_components/tuya_local/devices/moebot_s_mower.yaml

@@ -1,9 +1,11 @@
 name: Lawnmower
 products:
   - id: mvt4l2evgq2l3nkn
-    name: MoeBot S20
+    manufacturer: MoeBot
+    model: S20
   - id: icw5sal7xfcevsve
-    name: Parkside PMRDA 20-Li A1
+    manufacturer: Parkside
+    model: PMRDA 20-Li A1
 entities:
   - entity: lawn_mower
     dps:

custom_components/tuya_local/devices/moes_controlpanel.yaml

@@ -1,7 +1,9 @@
 name: Control hub
 products:
   - id: z1fcxdrpiazyjaky
-    name: Moes CCP-S01-EU-WH-EN touchscreen control panel IR and Bluetooth hub
+    manufacturer: Moes
+    model: CCP-S01-EU-WH-EN
+    name: Touchscreen control panel IR and Bluetooth hub
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/moes_dual_dimmer.yaml

@@ -1,7 +1,8 @@
 name: Dual dimmer
 products:
   - id: bxoo2swd
-    name: Moes ZM-105B-M-MS
+    manufacturer: Moes
+    model: ZM-105B-M-MS
 entities:
   - entity: light
     name: Light 1

custom_components/tuya_local/devices/moes_indoorptz_camera.yaml

@@ -1,7 +1,9 @@
 name: Camera
 products:
   - id: sy8xnbefqdxbgwti
-    name: Moes P52 PTZ indoor security camera
+    manufacturer: Moes
+    model: P52
+    name: PTZ indoor security camera
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/moes_motionsensor_light.yaml

@@ -1,7 +1,8 @@
 name: Motion sensor light
 products:
   - id: vwqnz1sn
-    name: Moes XZ-CGV3
+    manufacturer: Moes
+    model: XZ-CGV3
 entities:
   - entity: binary_sensor
     name: Motion detected

custom_components/tuya_local/devices/moes_motionsensor_switch.yaml

@@ -21,7 +21,8 @@
 name: Motion sensor switch
 products:
   - id: vd5jgg8vgdbaqerq
-    name: Moes Smart PIR switch
+    manufacturer: Moes
+    name: Smart PIR switch
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/moes_quad_switch.yaml

@@ -1,7 +1,8 @@
 name: Quad switch
 products:
   - id: mwiiltjyanw48oxm
-    name: Moes MS-104D
+    manufacturer: Moes
+    model: MS-104D
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/moes_star_projector.yaml

@@ -1,7 +1,7 @@
 name: Star projector
 products:
   - id: cw7kinnselbesfp9
-    name: Moes Smart Star Projector
+    manufacturer: Moes
 entities:
   - entity: light
     name: Background

custom_components/tuya_local/devices/moes_temp_humidity.yaml

@@ -1,7 +1,8 @@
 name: Thermostat and hydrostat
 products:
   - id: dlsdk5zvkuuhufpy
-    name: Moes MS-103
+    manufacturer: Moes
+    model: MS-103
 entities:
   - entity: switch
     name: Main switch

custom_components/tuya_local/devices/moes_threegang.yaml

@@ -1,7 +1,7 @@
 name: Triple switch with timer and backlight
 products:
   - id: m4viuhaiez8qjswh
-    name: Moes 3 Gang smart switch
+    manufacturer: Moes
 entities:
   - entity: light
     name: "Gang 1"

custom_components/tuya_local/devices/moes_touch_curtain_switch.yaml

@@ -1,7 +1,8 @@
 name: Curtain switch
 products:
   - id: 6tb9dko4t15optxz
-    name: Moes SCS80 Touch
+    manufacturer: Moes
+    model: SCS80 Touch
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/moes_trv_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Radiator valve
 products:
   - id: b6wax7g0
-    name: Moes Zigbee BRT-100-TRV
+    manufacturer: Moes
+    model: Zigbee BRT-100-TRV
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/moes_wht009_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: 14bmxdarlb4ravgd
-    name: Moes WHT-009
+    manufacturer: Moes
+    model: WHT-009
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/moes_wsyeuc_curtainswitch.yaml

@@ -1,7 +1,8 @@
 name: Curtain switch
 products:
   - id: 1qhlrytqcpnqmzj7
-    name: Moes WS-Y-EUC
+    manufacturer: Moes
+    model: WS-Y-EUC
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/moesgo_dimmer.yaml

@@ -1,7 +1,7 @@
 name: Dimmer switch
 products:
   - id: bf450789b46e8ff48f9n6r
-    name: MoesGo dimmer switch
+    manufacturer: MoesGo
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/moistenland_water_timer.yaml

@@ -1,7 +1,7 @@
 name: Irrigation timer
 products:
   - id: 8t5hebn0
-    name: MoistenLand BLE
+    manufacturer: MoistenLand
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/momcozy_white_noise_machine_v2.yaml

@@ -1,7 +1,7 @@
 name: White noise machine
 products:
   - id: dymvl7axplliptxx
-    name: Mom Cozy white noise machine
+    manufacturer: Mom Cozy
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/monzana_klimaanlage_air_conditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: rcbmbxfhfjka1kap
-    name: Monzana Klimaanlage
+    manufacturer: Monzana
+    model: Klimaanlage
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/morento_hy4866_wf.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: 5a4rez30alfjfmdg
-    name: Morento HY4866-WF
+    manufacturer: Morento
+    model: HY4866-WF
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/motion_sensor_light.yaml

@@ -1,11 +1,14 @@
 name: Motion Sensor Light
 products:
   - id: oapo5mmfbcr2y7ox
-    name: Deta 360 Motion Sensor
+    manufacturer: Deta
+    name: "360 Motion Sensor"
   - id: 8mrw54ape8opgl69
-    name: Deta Light Motion Sensor
+    manufacturer: Deta
+    name: Light Motion Sensor
   - id: pxyhz90upglpoedu
-    name: Arlec MAL315HA
+    manufacturer: Arlec
+    model: MAL315HA
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/mrc_magnum_floorheater.yaml

@@ -1,7 +1,9 @@
 name: Floor heating
 products:
   - id: fy783e8g0n38ahlt
-    name: MRC Magnum
+    manufacturer: Magnum
+    model: MRC remote control
+    name: Smart thermostat
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/multi_leaf_dy_107_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: gdusjavy8i4dpjlt
-    name: Multi-leaf DY-107
+    manufacturer: Multi-leaf
+    model: DY-107
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/mypin_6l_videopetfeeder.yaml

@@ -1,7 +1,8 @@
 name: Video pet feeder
 products:
   - id: 8zrzjldq07tlxnlv
-    name: Mypin 6L
+    manufacturer: Mypin
+    model: 6L
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/myq_td8_videodoorbell.yaml

@@ -1,7 +1,8 @@
 name: Video doorbell
 products:
   - id: wih9ybttb42lxb1q
-    name: myQ TD8
+    manufacturer: myQ
+    model: TD8
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/myuet_me82_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: 7ingxzrs0wo9rqsd
-    name: Myuet ME82
+    manufacturer: Myuet
+    model: ME82
 entities:
   - entity: climate
     translation_key: thermostat