Minor refactor of server name