Fixed normalized endpoint names