re arrange the aliases and shit