Changed the shortening of long names