Renamed master endpoints to adhere to some standard