Minor changes to server names