Add back two-letter short-hand names for common types.