Refactoring entity names.