Sort-of added the naming stuff into the endpoints.