Add support for servers with same name if hyper is different