Move all aliases to one function