Encapsulate new identifiers before rename

There are a lot of other chars that are not allowed in identifiers.