refactoring name identifiers