entity names refactoring