Updated Aliases

Moved some aliases and added some new ones.
If you look at the diff, you'll notice you're accidentally deleting a lot of aliases. Can you fix this?