add more aliases and change some others