Fix name with '_' in them being blank.