Move host/guest name logic to controller