Updated Aliases

Moved some aliases and added some new ones.