Change: refactoring name resolving and conversion