Updated endpoint names for within queries [Finishes #80831200]