Encapsulate new identifiers before rename