Various fixes for popular names