Merge "Fix endpoint names"