Use new helpers to get hostnames for endpoints