Zigbee2mqtt entities friendly names

Hi, what is the best way/process of clearing a device from all services concerned? Hass, mqtt, zigbee2mqtt etc

I have updated devices.yaml to have a friendly name for a device and I’d like that to register in the entities in home assistant. Each device has the correct name, but entities are still based on device Id, which won’t be too intuitive looking at the topic.

I’d like the topic to have the friendly name instead of the device id, so that if I decide to cut hass out as the middleman with NodeRed automations I can do it easily.

It seems that removing the mqtt integration and re-adding it (with hass restarts in between) sorts it out. But surely there’s a better way.