Refactoring method names and fixing specialization issues.