Update with new aliases from Josh Cheeck