Refactoring of names