Renamed supervisor to server supervisor