Alias refactor