Reorder aliases and remove scan10/30/100 aliases (#235)