Lexical renaming rework (part one and a half)