Added type name shortening.