Reorganize a few aliases