Zigbee Integration + Xiaomi Integration

I was just digging around in my config and I discovered that with the new integrations in the past months something was doing a mess.

For example:
I am using a Xiaomi Agara smart plug with zigbee2mqtt but in the integrations I have:

XIAOMI Integration

-Device:
plug_158d0001bc2dbe

-Entities
switch.plug_158d0001bc2dbe

MQTT Integration

-Device:
PresaAqara1

-Entities
switch.0x00158d0001bc2dbe_switch
sensor.0x00158d0001bc2dbe_power
sensor.presaaqara1_energy
sensor.presaaqara1_linkquality
sensor.presaaqara1_temperature

in zigbee2mqtt/configuration.yaml

 '0x00158d0001bc2dbe':
    friendly_name: PresaAqara1
    retain: false

In state page:
sensor.0x00158d0001bc2dbe_power (friendly_name: PresaAqara1_power)
sensor.presaaqara1_energy (friendly_name: PresaAqara1_energy)
sensor.presaaqara1_linkquality (friendly_name:PresaAqara1_linkquality)
sensor.presaaqara1_temperature (friendly_name: PresaAqara1_temperature)
switch.0x00158d0001bc2dbe_switch (friendly_name: PresaAqara1_switch)
switch.plug_158d0001bc2dbe (friendly_name: Plug_158d0001bc2dbe)

So I think I have the remove the device and entity from the Xiaomi integration.
Is this correct?

Also, why I have names like:
sensor.0x00158d0001bc2dbe_power and switch.0x00158d0001bc2dbe_switch ?
I was expecting:
sensor.presaaqara1_power and switch.presaaqara1_switch.

Thanks.