Changed names in the server controller