Refactoring. Rename classes. Identify new helpers methods.