Made service names consistent with the rest of the API