criteria refactoring renaming