Change to alias resolution