Shortened names, as per Matei's suggestion