Reorder and update aliases