Refactoring of the name