cleanup default entity name resolution