Correct short names.