Improve logic for cohort visibility labels

TNL-25
I'm concerned that giving that name to a function that only does part of what we need could be misleading. I'd prefer to see a larger refactoring to actually make that function do what we want.