Refactor aliases