Fix problem shortnames.