Products cleanup: E-G

- 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 `e`, 'f' and `g`.

custom_components/tuya_local/devices/earu_dpn_circuitbreaker.yaml

@@ -1,7 +1,8 @@
 name: Circuit breaker
 products:
   - id: azpywu5zfg5wyzpn
-    name: EARU SW MCB
+    manufacturer: EARU
+    model: SW MCB
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/earu_k6h3aw_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: v6foggibzyjlvwdx
-    name: EARU Electronic K6H-3A-W
+    manufacturer: EARU
+    model: K6H-3A-W
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/earu_smart_wifi_circuit_breaker_with_energy_monitor.yaml

@@ -1,9 +1,11 @@
 name: Circuit breaker
 products:
   - id: ine4hhapkgxonij1
-    name: EARU SW RCB
+    manufacturer: EARU
+    model: SW RCB
   - id: aqktrdhlsw8q90dr
-    name: Zemismart SPM01-D2TW-ZM
+    manufacturer: Zemismart
+    model: SPM01-D2TW-ZM
 entities:
   - entity: switch
     icon: "mdi:fuse"

custom_components/tuya_local/devices/ebac_dj4000_dehumidifier.yaml

@@ -1,7 +1,8 @@
-name: EBAC DJ4000 dehumidifier
+name: Dehumidifier
 products:
   - id: ehsgslj5gb0amqnx
-    name: DJ4000
+    manufacturer: EBAC
+    model: DJ4000
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/eberg_rico_r12e2_dehumidifier.yaml

@@ -1,7 +1,9 @@
 name: Dehumidifier
 products:
   - id: dcz1i1obofram8zt
-    name: Eberg Rico R12E2
+    manufacturer: Eberg
+    model: Rico
+    model_id: R12E2
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/ecopoint_ev_charger.yaml

@@ -1,7 +1,8 @@
 name: EV charger
 products:
   - id: jui3mys5c9rfdju2
-    name: Ecopoint 32A EV charger
+    manufacturer: Ecopoint
+    model: 32A
 entities:
   - entity: sensor
     translation_key: status

custom_components/tuya_local/devices/ecostrad_accentiq_heater.yaml

@@ -1,9 +1,11 @@
 name: Heater
 # products:
 #   - id: UNKNOWN
-#     name: Ecostrad Accent iQ
+#     manufacturer: Ecostrad
+#     model: Accent iQ
 #   - id: UNKNOWN
-#     name: Byecold B0DF1PKDFP
+#     manufacturer: Byecold
+#     model: B0DF1PKDFP
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/edgetheorylabs_coldplunge_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Pool heat pump
 products:
   - id: orwtoimcnasji7jw
-    name: Edge Theory Labs cold plunge heat pump
+    manufacturer: Edge Theory Labs
+    name: Cold plunge heat pump
 entities:
   - entity: climate
     translation_key: pool_heatpump

custom_components/tuya_local/devices/eglo_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: k8j78n65zeu3orz7
-    name: Eglo Surf
+    manufacturer: Eglo
+    model: Surf
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/electric_panel_heater.yaml

@@ -1,7 +1,8 @@
 name: Panel heater
 products:
   - id: urxauhwqufusih5h
-    name: Cleverio AR10 / AR20
+    manufacturer: Cleverio
+    model: AR10 / AR20
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/electriq_airflex15w_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Heat pump
 products:
   - id: 4RUISW6Lmtz2u1l8
-    name: ElectriQ Airflex 15W
+    manufacturer: ElectriQ
+    model: Airflex 15W
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/electriq_cd20pro_dehumidifier.yaml

@@ -2,11 +2,14 @@ name: Dehumidifier
 legacy_type: klarstein_dryfy_pro_connect_dehumidifier
 products:
   - id: b07ueqf4ymelhbi9
-    name: Klarstein DryFy Pro Connect V2
+    manufacturer: Klarstein
+    model: DryFy Pro Connect
   - id: 6cguug02fnygou5c
-    name: Klarstein Dryfy Pro Connect
+    manufacturer: Klarstein
+    model: Dryfy Pro Connect
   - id: m0wtqltrepknlpdj
-    name: Morris Premier plus
+    manufacturer: Morris
+    model: Premier Plus
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/electriq_desd9lwv2_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: g2hl04s82mgtkpec
-    name: ElectriQ DESD9LW-V2
+    manufacturer: ElectriQ
+    model: DESD9LW-V2
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/electriq_pd45e_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: 75174020a4e57c1945ca
-    name: Electriq PD45E
+    manufacturer: Electriq
+    model: PD45E
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/elinksmart_khsy2626_fan.yaml

@@ -1,7 +1,8 @@
 name: Fan
 products:
   - id: t5nfkruajk3rl4fq
-    name: elinkSmart KH-SY2626
+    manufacturer: elinkSmart
+    model: KH-SY2626
 entities:
   - entity: fan
     translation_key: fan_with_presets

custom_components/tuya_local/devices/elspet_cat_litterbox.yaml

@@ -1,7 +1,8 @@
 name: Cat litter box
 products:
   - id: asx54fyagpyhxtej
-    name: Elspet Spaceship
+    manufacturer: Elspet
+    model: Spaceship
 entities:
   - entity: switch
     name: Power

custom_components/tuya_local/devices/em3378_weather_station.yaml

@@ -1,7 +1,7 @@
 name: Weather Station
 products:
   - id: q9opgtca8ymbxpqn
-    name: EM3378
+    model: EM3378
 entities:
   - entity: sensor
     name: Indoor temperature

custom_components/tuya_local/devices/ems_waterheater.yaml

@@ -1,7 +1,9 @@
 name: Water heater
 products:
   - id: nqlqesmkrje7vdhm
-    name: EMS Thermal TH200DT heatpump
+    manufacturer: EMS
+    model: Thermal heat pump
+    model_id: TH200DT
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/emylo_energy_meter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: nqbs1onwskmmmaac
-    name: eMylo EAI-90
+    manufacturer: eMylo
+    model: EAI-90
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/enbrighten_cafe_stringlights.yaml

@@ -1,7 +1,9 @@
 name: String lights
 products:
   - id: irp66izb2pbedb4o
-    name: Enbrighten Café WB-57415
+    manufacturer: Enbrighten
+    model: Café
+    model_id: WB-57415
 entities:
   - entity: light
     icon: "mdi:led-strip"

custom_components/tuya_local/devices/energy_monitoring_powerstrip.yaml

@@ -1,6 +1,7 @@
 name: Energy monitoring powerstrip
 products:
   - id: 7hBwPPNdDP1xHrWv
+    model: WP30
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/ept_level_sensor.yaml

@@ -1,7 +1,8 @@
 name: Level sensor
 products:
   - id: npfinze0zsvta7aj
-    name: EPT 3m ultrasonic
+    manufacturer: EPT
+    model: 3m ultrasonic
 entities:
   - entity: sensor
     translation_key: status

custom_components/tuya_local/devices/eruiklink_curtains.yaml

@@ -1,7 +1,8 @@
 name: Curtain
 products:
   - id: oxzxmhkdvqexpwqo
-    name: Eruiklink curtain motor
+    manufacturer: Eruiklink
+    name: Curtain motor
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/erz04c_energy_meter.yaml

@@ -1,8 +1,7 @@
 name: Double clamp meter
 products:
   - id: dhto3y4uachr1wll
-    name: erz04c
-    # protocol: 3.5
+    model: ERZ04C
 entities:
   - entity: sensor
     name: Total energy

custom_components/tuya_local/devices/es01_powerstrip.yaml

@@ -1,6 +1,7 @@
-name: Smart plug with USB ES-01
+name: Smart plug with USB
 products:
   - id: hsoiigeykxh9m4hx
+    model: ES-01
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/espfort_ecspsp_usbsmartplug.yaml

@@ -1,7 +1,8 @@
 name: USB smartplug
 products:
   - id: ynz9qmnmnsciccyc
-    name: ESP Fort EC-SPSP
+     manufacturer: ESP Fort
+     model: EC-SPSP
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/etersky_aroma_diffuser.yaml

@@ -1,7 +1,7 @@
 name: Aroma diffuser
 products:
   - id: rvajlvjh4qoj1lkn
-    name: Etersky
+    manufacturer: Etersky
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/etersky_curtain_switch.yaml

@@ -1,7 +1,8 @@
 name: Curtain switch
 products:
   - id: 81dyy7vqe426s0yc
-    name: Etersky WF-CS01
+    manufacturer: Etersky
+    model: WF-CS01
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/etna_vw644mc_dishwasher.yaml

@@ -1,7 +1,8 @@
 name: Dishwasher
 products:
   - id: hmwl5vpd1zanu6ma
-    name: Etna VW644MC
+    manufacturer: Etna
+    model: VW644MC
 entities:
   - entity: switch
     icon: "mdi:dishwasher"

custom_components/tuya_local/devices/etop_ch7100_thermostat.yaml

@@ -1,6 +1,8 @@
-name: ETOP CH7100 thermostat
+name: Thermostat
 products:
   - id: evklbfoqwp4dygts
+    manufacturer: ETOP
+    model: CH7100
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/etop_fcu_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: psetc59fvtm5gexl
-    name: ETOP-FCU(CF) | Jaga JRT-100TW
+    manufacturer: ETOP / Jaga
+    model: FCU / JRT-100TW
 entities:
   - entity: climate
     name: Thermostat

custom_components/tuya_local/devices/etop_ht_thermostat.yaml

@@ -1,9 +1,11 @@
 name: Thermostat
 products:
   - id: viav1onpzcozfneb
-    name: ETOP HT-01AC
+    manufacturer: ETOP
+    model: HT-01AC
   - id: zhfbsam03cs0ge5n
-    name: PNI CT-400
+    manufacturer: PNI
+    model: CT-400
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/eurom_alutherm_heater.yaml

@@ -1,9 +1,11 @@
 name: Heater
 products:
   - id: 20qAGCEd0AxowwTA
-    name: Eurom Alutherm 2000
+    manufacturer: Eurom
+    model: Alutherm 2000
   - id: awnds45afwineiul
-    name: Eurom Alutherm 2500
+    manufacturer: Eurom
+    model: Alutherm 2500
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/eurom_alutherm_heater_v2.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: kotlg4xiajpds72u
-    name: Eurom Alutherm 2000 v2
+    manufacturer: Eurom
+    model: Alutherm 2000
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/eurom_sani_bathroom_towel_radiator.yaml

@@ -1,9 +1,13 @@
 name: Bathroom radiator
 products:
   - id: bc6gdgt0cpq1jmjz
-    name: Eurom Sani LBH-63
+    manufacturer: Eurom
+    model: Sani
+    model_id: LBH-63
   - id: 7pojgyvxlwa4igrm
-    name: Eurom Sani LBH-63A
+    manufacturer: Eurom
+    model: Sani
+    model_id: LBH-63A
 entities:
   - entity: climate
     translation_key: heater

custom_components/tuya_local/devices/evotherm_eti_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Pool heat pump
 products:
   - id: k5vqutj2llzox1gg
-    name: Evotherm ETI series / AquaForte
+    manufacturer: Evotherm / AquaForte
+    model: ETI series
 entities:
   - entity: climate
     translation_only_key: pool_heatpump

custom_components/tuya_local/devices/ezaiot_r9lite_thermostat.yaml

@@ -3,7 +3,8 @@ name: Thermostat
 # Electric Heating 16A version
 products:
   - id: dq6nlukkifyawj9n
-    name: EZAIOT R9Lite thermostat
+    manufacturer: EZAIoT
+    model: R9Lite
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/ezaiot_thermostat_smartplug.yaml

@@ -3,7 +3,7 @@ products:
   # Brand name: EZAIOT
   # Product link: aliexpress.com/item/1005007122621628.html
   - id: msclnsfe0q3yd39q
-    name: EZAIoT socket thermostat
+    manufacturer: EZAIoT
 entities:
   - entity: climate
     translation_key: thermostat

custom_components/tuya_local/devices/fairland_iphcr15_heatpump.yaml

@@ -1,9 +1,11 @@
 name: Pool heatpump
 products:
   - id: qrlLaHWwIsZsV31f
-    name: Phalén Calidi XP
+    manufacturer: Phalén
+    model: Calidi XP
     # - id: UNKNOWN
-    #   name: Fairland InverterPlus
+    #   manufacturer: Fairland
+    #   model InverterPlus
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/fairland_rmic06_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Pool heat pump
 # products:
 #   - id: UNKNOWN
-#     name: Fairland RMIC06
+#     manufacturer: Fairland
+#     model: RMIC06
 entities:
   - entity: climate
     translation_key: pool_heatpump

custom_components/tuya_local/devices/fairland_x20_poolheatpump.yaml

@@ -1,9 +1,11 @@
 name: Pool heatpump
 products:
   - id: 1ovawewadpk2jiaw
-    name: Pool-Systems IPS-100MAX
+    manufacturer: Pool-Systems
+    model: IPS-100MAX
   - id: a4bepadftizzrd8g
-    name: Fairland X20 series
+    manufacturer: Fairland
+    model: X20 series
 entities:
   - entity: climate
     translation_only_key: pool_heatpump

custom_components/tuya_local/devices/fanco_ecosilentdeluxe.yaml

@@ -1,7 +1,9 @@
 name: Fan
 products:
   - id: agyqzsfpafsvkrl9
-    name: Fanco Eco Silent Deluxe MZ-DCFAN
+    manufacturer: Fanco
+    model: Eco Silent Deluxe
+    model_id: MZ-DCFAN
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/faroro_pet_feeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: vglnuveujzyrpku9
-    name: Faroro PF50
+    manufacturer: Faroro
+    model: PF50
 entities:
   - entity: number
     name: Manual feed

custom_components/tuya_local/devices/feit_dimmer.yaml

@@ -1,7 +1,8 @@
 name: Dimmable light
 products:
   - id: tebc75erlgslgpn5
-    name: Feit Dimmer
+    manufacturer: Feit
+    name: Dimmer
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/ferroli_titano_twin.yaml

@@ -1,7 +1,9 @@
 name: Water heater
 products:
   - id: lci0ebsz7ftaruaf
-    name: Ferroli Titano Twin DT EWH
+    manufacturer: Ferroli
+    model: Titano Twin
+    model_id: DT EWH
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/feyree_ev_charger.yaml

@@ -1,9 +1,12 @@
 name: EV charger
 products:
   - id: hytatexziwaifxj1
-    name: Feyree 32A 85-264V EV charger
+    manufacturer: Feyree
+    model: 32A 85-264V
   - id: emvuyyax4lekiooj
-    name: Feyree A_32A_1L ChargePoint
+    manufacturer: Feyree
+    model: ChargePoint
+    model_id: A_32A_1L
 entities:
   - entity: sensor
     class: enum

custom_components/tuya_local/devices/fisher_summer_air_conditioner.yaml

@@ -1,11 +1,14 @@
 name: Air conditioner
 products:
   - id: bf8705744de2dd5ab4ogqj
-    name: Fisher Summer
+    manufacturer: Fisher
+    model: Summer
   - id: u9jjsaluqe1trtxv
-    name: Daitsu DS-9KTP
+    manufacturer: Daitsu
+    model: DS-9KTP
   - id: fcnlevuwfd1jgkvx
-    name: Tesla TT34TP21-1232IAWUV
+    manufacturer: Tesla
+    model: TT34TP21-1232IAWUV
 entities:
   - entity: climate
     translation_only_key: aircon_extra

custom_components/tuya_local/devices/fisher_water_heatpump.yaml

@@ -1,7 +1,9 @@
 name: Radiator heatpump
 products:
   - id: 3gabjnrhtblg3ub6
-    name: Fisher e-HeatR air-water heatpump
+    manufacturer: Fisher
+    model: e-HeatR
+    name: Air-water heatpump
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/flinq_breeze_pedestalfan.yaml

@@ -1,7 +1,8 @@
 name: Pedestal fan
 # products:
 #   - id: unknown
-#     name: FlinQ Breeze
+#     manufacturer: FlinQ
+#     model: Breeze
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/forceclima_soundless_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Portable air conditioner
 products:
   - id: njvdabnnx51jiqiq
-    name: ForceClima Soundless
+    manufacturer: ForceClima
+    model: Soundless
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/fresco_hydrateultra_petfountain.yaml

@@ -1,8 +1,8 @@
 name: Pet fountain
 products:
   - id: cuw2k3ho3e25fade
-    name: Petoneer Fresco Hydrate Ultra
-
+    manufacturer: Petoneer
+    model: Fresco Hydrate Ultra
 entities:
   - entity: switch
     icon: "mdi:water-pump"

custom_components/tuya_local/devices/fresco_hydrateultra_petfountain_v2.yaml

@@ -1,8 +1,8 @@
 name: Pet fountain
 products:
   - id: avhcsv4u4nj05otr
-    name: Petoneer Fresco Hydrate Ultra
-
+    manufacturer: Petoneer
+    model: Fresco Hydrate Ultra
 entities:
   - entity: valve
     icon: "mdi:water-pump"

custom_components/tuya_local/devices/friedrich_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: vfdma8hzkgpdkwlm
-    name: Friedrich UCT14A30/UCT12A30
+    manufacturer: Friedrich
+    model: UCT14A30/UCT12A30
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/friedrich_uct08b10a_airconditioner.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: jvnwkkvvshk3go8f
-    name: Friedrich UCT08B10A
+    manufacturer: Friedrich
+    model: UCT08B10A
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/fs_03w_curtain.yaml

@@ -1,6 +1,7 @@
 name: Curtain module
 products:
   - id: 5rr5k8fzjcogubkt
+    model: FS-03W
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/fujicool_yuzu_heatpump.yaml

@@ -1,7 +1,8 @@
 name: Heatpump
 # products:
 #  - id: UNKNOWN
-#    name: Fujicool Yuzu
+#    manufacturer: Fujicool
+#    model: Yuzu
 entities:
   - entity: climate
     translation_only_key: aircon_extra

custom_components/tuya_local/devices/gainsboroughliberty_entrance_lock.yaml

@@ -1,7 +1,8 @@
 name: Door lock
 products:
   - id: yfqp0shy
-    name: Gainsborough Liberty entrance lock
+    manufacturer: Gainsborough
+    model: Liberty Smart Entrance Lock
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/galaxy_projector_light.yaml

@@ -1,9 +1,11 @@
 name: Star projector
 products:
   - id: okyhahmixunjmbca
-    name: Galaxy projector
+    model: Galaxy
   - id: jteg9ktrhbxtiicz
-    name: BlissLights Sky Lite Evolve SKY-EVOLVE-B-RCW8
+    manufacturer: BlissLights
+    model: Sky Lite Evolve
+    model_id: SKY-EVOLVE-B-RCW8
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/gaqqee_kws302wf_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: tadm13agjigbdtxd
-    name: Gaqqee KWS-302-WF
+    manufacturer: Gaqqee
+    model: KWS-302-WF
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/garza_irrigation_system.yaml

@@ -1,7 +1,8 @@
 name: Garden irrigation system
 products:
   - id: xnajzurgqo1ugohn
-    name: Garza ITV103W
+    manufacturer: Garza
+    model: ITV103W
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/gautone_pg103_alarm.yaml

@@ -1,9 +1,11 @@
 name: Alarm security system
 products:
   - id: eb26b0818666ecd284o4qe
-    name: GauTone PG-103
+    manufacturer: GauTone
+    model: PG-103
   - id: gyitctrjj1kefxp2
-    name: "PG103/PG105/PG106/PG107/PG109"
+    manufacturer: PGST
+    model: "PG103/PG105/PG106/PG107/PG109"
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/ge_jasco_ultra_pro_toggle_dimmer_v2.yaml

@@ -5,7 +5,8 @@
 name: Dimmer module
 products:
   - id: genhs8iixkqve7sx
-    name: GE Jasco Ultra Pro Toggle Dimmer v2
+    manufacturer: Jasco
+    model: UltraPro Toggle Dimmer
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/ge_jasco_ultra_pro_toggle_switch.yaml

@@ -3,9 +3,11 @@
 name: Toggle switch
 products:
   - id: 7kvomtxxfqcrbiqq
-    name: GE Jasco Ultra Pro
+    manufacturer: Jasco
+    model: UltraPro Toggle Switch
   - id: nobhkdmuof1zhgle
-    name: Loratap QCRR400W-WB2S
+    manufacturer: Loratap
+    model: QCRR400W-WB2S
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/geyserwise_water_heater.yaml

@@ -1,7 +1,9 @@
 name: Water heater
 products:
   - id: ox9jyuavu5v78o2y
-    name: Geyserwise TSE geyser timer and controller
+    manufacturer: Geyserwise
+    model: TSE
+    name: Geyser timer and controller
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/ghome_sw19_fanlight.yaml

@@ -1,7 +1,8 @@
 name: Fan and light switch
 products:
   - id: j11gop7l2l3sblc2
-    name: GHome SW19
+    manufacturer: GHome
+    model: SW19
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml

@@ -1,7 +1,8 @@
 name: Water heater
 products:
   - id: rmzdb9fyj9jo1bza
-    name: Giatsu GIA-ATS-O-300VAWT
+    manufacturer: Giatsu
+    model: GIA-ATS-O-300VAWT
 entities:
   - entity: water_heater
     dps:

custom_components/tuya_local/devices/gold_cct_lightbulb.yaml

@@ -1,7 +1,8 @@
 name: Gold lightbulb
 products:
   - id: baf9tt9lb8t5uc7z
-    name: Dim2Warm G95 golden globe
+    model: Dim2Warm G95
+    name: Golden globe
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/goldair_101cm_tower_fan.yaml

@@ -1,7 +1,8 @@
 name: Tower fan
 products:
   - id: xonvukal96pf99s6
-    name: Goldair 101cm Tower Fan
+    manufacturer: Goldair
+    model: 101cm Tower Fan
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/goldair_dehumidifier.yaml

@@ -1,8 +1,9 @@
-name: Goldair dehumidifier
+name: Dehumidifier
 legacy_type: dehumidifier
 products:
   - id: gynthidZEhTUCoMN
-    name: GPDH420
+    manufacturer: Goldair
+    model: GPDH420
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/goldair_gpdh340_dehumidifier.yaml

@@ -1,7 +1,8 @@
-name: Goldair dehumidifier
+name: Dehumidifier
 products:
   - id: okwjubkm9ndbq3j
-    name: GPDH340
+    manufacturer: Goldair
+    model: GPDH340
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/goldair_phet07ea_heater.yaml

@@ -1,7 +1,8 @@
 name: Panel heater
 products:
   - id: 71v2TpoRp54r0Vmj
-    name: Goldair PH-ET07EA
+    manufacturer: Goldair
+    model: PH-ET07EA
 entities:
   - entity: climate
     translation_key: heater

custom_components/tuya_local/devices/goldair_platinum_tower_fan.yaml

@@ -1,7 +1,8 @@
 name: Tower fan
 products:
   - id: hgsp7xfajllkqujw
-    name: Goldair Platinum Tower Fan
+    manufacturer: Goldair
+    model: Platinum Tower Fan
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/goldair_portable_airconditioner.yaml

@@ -2,9 +2,11 @@ name: Air conditioner
 legacy_type: nedis_mobile_airconditioner
 products:
   - id: gylvqvz3p94i3zdn
-    name: Goldair 4-in-1 portable
+    manufacturer: Goldair
+    name: "4-in-1 portable air conditioner"
   - id: vrredpnf22yayvhi
-    name: Nedis ACMB1WT12
+    manufacturer: Nedis
+    model: ACMB1WT12
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/goldair_smartsleep_bedwarmer.yaml

@@ -1,7 +1,8 @@
 name: Electric blanket
 products:
   - id: mqcffjumdpuahxmi
-    name: Goldair Platinum SmartSleep
+    manufacturer: Goldair
+    model: Platinum SmartSleep
 entities:
   - entity: switch
     icon: "mdi:bed"

custom_components/tuya_local/devices/goodcell_ev_charger.yaml

@@ -2,9 +2,11 @@ name: EV charger
 legacy_type: feyree_3phase_ev_charger
 products:
   - id: j6bzjwhiv2cljjcy
-    name: Goodcell 32A 85-264V 3 phase
+    manufacturer: Goodcell
+    model: 32A 85-264V 3 phase
   - id: basqjlsmzcq8ipva
-    name: Feyree 7.6kW 32A
+    manufacturer: Feyree
+    model: 7.6kW 32A
 entities:
   - entity: sensor
     class: enum

custom_components/tuya_local/devices/gorilla_fan_v2.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 # products:
 #   - id: UNKNOWN
-#     name: Atomberg Gorilla Fan V2
+#     manufacturer: Atomberg
+#     model: Gorilla Fan V2
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/gosund_sp112_usbsmartplug.yaml

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

custom_components/tuya_local/devices/gosund_usb_triple_powerstrip.yaml

@@ -1,7 +1,8 @@
 name: USB + 3 outlet power monitor powerstrip
 products:
   - id: tsbguim4trl6fa7g
-    name: Gosund P1
+    manufacturer: Gosund
+    model: P1
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/gratkit_filament_dryer.yaml

@@ -1,7 +1,8 @@
 name: Filament dryer
 products:
   - id: mxct11k2jqpak13a
-    name: GratKit Firefly Smart Dryer Box
+    manufacturer: GratKit
+    model: Firefly Smart Dryer Box
 entities:
   - entity: switch
     icon: "mdi:heat-pump"

custom_components/tuya_local/devices/graywind_shades.yaml

@@ -1,7 +1,8 @@
 name: Window shade
 products:
   - id: hldq12vsaqalcfer
-    name: Graywind hardwired blackout
+    manufacturer: Graywind
+    name: Hardwired blackout
 entities:
   - entity: cover
     class: shade

custom_components/tuya_local/devices/greenmigo_alpha_q25_pro_wifi.yaml

@@ -2,7 +2,8 @@ name: Dehumidifier
 legacy_type: AlecoAir_D25_Traditio
 products:
   - id: b9oyi2yofflroq1g
-    name: Alpha Q25 Pro dehumidifier
+    manufacturer: Greenmigo
+    model: Alpha Q25 Pro
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/greenwind_dehumidifier.yaml

@@ -1,6 +1,7 @@
-name: Greenwind dehumidifier
+name: Dehumidifier
 products:
   - id: 3ZXJDubQ13lNTaLT
+    manufacturer: Greenwind
 entities:
   - entity: humidifier
     class: dehumidifier