Update names so abbreviations aren't ever longer than the name to be used.