Move more of the aliases to correct place