Fix display of OS names in description and family

Tests to follow later today, hopefully.