More alias changes
Even more shortcuts