refactoring: rename desugarings and change traversals