Added a heap of aliases to help with fetching and merging upstream