Clean up endpoint names