Move aliases to abbreviations