Move renaming logic to action
Add optional starting text for parsing
Fix Identifier lexical rule