I made a helper “switch as x” for my switch.dining_room_light, and this was the result:
I can’t do it in the UI since the dining room light is in my switches.yaml.
Weird, it shouldn’t have. I just tried it again on another switch and the entity was named correctly. But changing the entity id to the desired value is easy enough. Just click it and rename it.
Either way, you got it figured out!