Naming of entities refactoring