Area and group with same name

When I started with my Home Assistant configuration, Area’s didn’t exist yet. Then when this was introduced, I started putting the devices in the right area; but previously I had already created groups for this.

So now with my new shelly mqtt devices, I have a group called “Livingroom” and an area called “Livingroom”. What is the best way to merge them? As far as I can see I cannot manually put entities in area’s.

I can put them in groups, by configuring the entities in groups.yaml. But then; how do I ‘hide’ the area with the same name?

Also I have two yeelights which don’t have an unique id (that’s what HA tells me). So I cannot add them to an area with the UI. So I guess I can only add these devices in groups; not in area’s?

At the moment area’s and groups are really confusing. Too bad there isn’t more documentation about this.