refactoring of names