Moved more aliases to seperate file