Refactor: solve -> solution