Rework getting short names