fixed conflicting server names