Refactoring of the names