Renamed Z-Wave entities lost after restart

Howdy all,

On HA .87 (or maybe previous), I can rename the entities using the ‘cog’ from the developer states page. I.e. Find the entity, click on the details icon, click on the cog, and change the Entity ID and save.

This works until HA is restarted. On restart, all the Entity IDs revert to their original values.

What is the best way to rename entities so that they persist between HA restarts?