Reorganize aliases