Resolved Blueprint endpoint name clash issues