Refactor new explicit aliases