Renaming REST endpoints to reflect new spec wording
Service rename, to reflect new spec wordings