refactoring entity handler name