it’s pointless to add a name at this point after adding unique_id because the device is now in the entity registry. Yaml changes won’t update the name. Just edit the names & entity_id’s in the UI and note this in the future. When creating new entities, just supply both a unique_id and a name. Your entity_id will be a slugified version of the name and you can edit it in the UI.