Fix pluralization issue in solutions