Hi,
unfortunately, my thread was closed really quickly after solution was posted.
I have a follow up:
Is it possible to batch reset or at least reset all entities of one device rather than having to manually reset every single entity of every affected device?
Go to the Device’s view and click the expansion menu button in the top right corner and select “Recreate Entity IDs”.
Then you will be presented with a popup that shows the entities that will change
Another option would be to use the Spook custom integration. It includes an action, homeassistant.update_entity_id, that makes it possible to change entity IDs. So, with a template or two and a repeat.for_each, you could call the action on all the entities of a device.
Thank you very much 
