Rename short_name to shortName