How do you guys deal with duplicate Alexa names AND multiple accounts?

Hi guys,

I recently moved in with a roomate and brought with me all my smart home stuff,
he had an Alexa already and I have another, What I did until now with duplicate device names (I.E “bedroom TV”, “Bedroom AC”, “Computer”) was to discover everything, then each of us deletes the device that isn’t his, in the past this worked but now Alexa seems to randomly rediscover devices and everything stops working again.
I’m not sure this matters, but his alexa is on his amazon account obviously.

how do you guys handle duplicate device names properly?