changing endpoints to be friendly to the starphleet layout