Make server names generic