Added an explicit "short_name" property