Updated aliases and a few ignore nicks