add code to handle endpoint name collisons