Bring hostnames in line with RPC 9.0 naming