Z-Wave device stops responding after entity_id rename

Configuration Z-Wave
1

I’d like to change the entity_id for some z-wave switches, because that would be much easier to handle in the automation and group entries.

As far as I understand the proper way to rename an entitiy_id is by clicking the gear-box in the UI and changing it there. However, as soon as I change the entitity_id, the z-wave device stops responding. Besides, the gear-box icon is not shown any longer.
After removing core.entity_register, names are reset, and everything the device starts working again.

Gearbox gone:
image

HA_Version: 0.82.1

2

had that too, was fixed after restarting HA and a few minutes of wating