replace 'generator' with 'solver'