Renamed Constanst to Endpoints