[fix] Refactoring of method names and responsibilities.