Tasmota integration using device_name instead of friendly_name

Hello everyone,
I have multiple Shelly 2.5 and as you know the monitor the power for both outputs.
And both are shown separately in the WebUI. However, when using MQTT, despite setting two friendly_names, the power monitoring data is always sent as device_name with a number suffix.
The switch of the Tasmota device is automatically labelled with its friendly_name, as it should be.

So it seems the integration is overlooking that there are power monitoring devices that have two channels/sensors.
They are being given separate names (device_name plus suffix number) but they should be given friendly_name 1 and friendly_name 2.

Thank you
Alex

EDIT: i opened an issue on github, but if anybody knows an intermediate fix, that would be great :slight_smile: