I haven't checked the UI yet, but should we use the desc instead of the name?  Ideally this is what we want to use on the host list too.