Making names slightly shorter (but consistent).