More consistency in shortening names.