Change endpoint name handling